diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-06-26 00:41:35 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-06-26 00:41:35 +0300 |
| commit | 5344dc6cd9156a9b67da834c9b5b4be00a62992a (patch) | |
| tree | e71a20fbc231ccec6e53a718758eea447cfc7069 /src/text.cpp | |
| parent | 02822f84a25b261f02f5928a6cbefe103cd9491e (diff) | |
| download | manaverse-5344dc6cd9156a9b67da834c9b5b4be00a62992a.tar.gz manaverse-5344dc6cd9156a9b67da834c9b5b4be00a62992a.tar.bz2 manaverse-5344dc6cd9156a9b67da834c9b5b4be00a62992a.tar.xz manaverse-5344dc6cd9156a9b67da834c9b5b4be00a62992a.zip | |
Add missing checks into other files.
Diffstat (limited to 'src/text.cpp')
| -rw-r--r-- | src/text.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/text.cpp b/src/text.cpp index a665de641..c4540dd4c 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -56,8 +56,8 @@ Text::Text(const std::string &text, mXOffset(0), mText(text), mColor(color), - mOutlineColor(isSpeech == Speech_true ? - *color : theme->getColor(ThemeColorId::OUTLINE, 255)), + mOutlineColor(color ? (isSpeech == Speech_true ? + *color : theme->getColor(ThemeColorId::OUTLINE, 255)) : Color()), mIsSpeech(isSpeech), mTextChanged(true) { |