diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-02-02 05:11:50 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-02-02 05:11:50 +0300 |
| commit | f498d80c587033bffb9abedb2b0827ad8d4a2a32 (patch) | |
| tree | 82da8928768b2159c199c2d033388a071f228582 /src/gui/widgets | |
| parent | 1ba44aeb62414ea349e462b6d4fccbaac00be115 (diff) | |
| download | manaplus-f498d80c587033bffb9abedb2b0827ad8d4a2a32.tar.gz manaplus-f498d80c587033bffb9abedb2b0827ad8d4a2a32.tar.bz2 manaplus-f498d80c587033bffb9abedb2b0827ad8d4a2a32.tar.xz manaplus-f498d80c587033bffb9abedb2b0827ad8d4a2a32.zip | |
Add some checks after automatic checking.
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/chattab.cpp | 14 | ||||
| -rw-r--r-- | src/gui/widgets/textbox.h | 3 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp index aea367482..6d5dfc9dd 100644 --- a/src/gui/widgets/chattab.cpp +++ b/src/gui/widgets/chattab.cpp @@ -224,9 +224,17 @@ void ChatTab::chatLog(std::string line, Own own, { struct tm *timeInfo; timeInfo = localtime(&t); - line = strprintf("%s[%02d:%02d] %s%s", lineColor.c_str(), - timeInfo->tm_hour, timeInfo->tm_min, tmp.nick.c_str(), - tmp.text.c_str()); + if (timeInfo) + { + line = strprintf("%s[%02d:%02d] %s%s", lineColor.c_str(), + timeInfo->tm_hour, timeInfo->tm_min, tmp.nick.c_str(), + tmp.text.c_str()); + } + else + { + line = strprintf("%s %s%s", lineColor.c_str(), + tmp.nick.c_str(), tmp.text.c_str()); + } } else { diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h index 6d2467b38..a052247c4 100644 --- a/src/gui/widgets/textbox.h +++ b/src/gui/widgets/textbox.h @@ -59,7 +59,8 @@ class TextBox : public gcn::TextBox */ inline void draw(gcn::Graphics *graphics) { - setForegroundColor(*mTextColor); + if (mTextColor) + setForegroundColor(*mTextColor); gcn::TextBox::draw(graphics); } |