diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-10-11 14:48:19 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-10-11 15:24:57 +0300 |
| commit | f1b82c1b06604c2c1eed750a6c980aa0b5355560 (patch) | |
| tree | 3e524583691af0e5a17e5ee974439b4c6ea07ef4 /src/text.cpp | |
| parent | 452f2489bf3225235797ea08ea0d466f80409a87 (diff) | |
| download | manaplus-f1b82c1b06604c2c1eed750a6c980aa0b5355560.tar.gz manaplus-f1b82c1b06604c2c1eed750a6c980aa0b5355560.tar.bz2 manaplus-f1b82c1b06604c2c1eed750a6c980aa0b5355560.tar.xz manaplus-f1b82c1b06604c2c1eed750a6c980aa0b5355560.zip | |
First part of checks from Parasoft C++ Test.
Diffstat (limited to 'src/text.cpp')
| -rw-r--r-- | src/text.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/text.cpp b/src/text.cpp index a2cd492c2..205e945ac 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -43,7 +43,7 @@ Text::Text(const std::string &text, const int x, const int y, const gcn::Graphics::Alignment alignment, const gcn::Color* color, const bool isSpeech, gcn::Font *const font) : - mFont(font ? font : gui->getFont()), + mFont(font ? font : (gui ? gui->getFont() : nullptr)), mX(x), mY(y), mWidth(mFont->getWidth(text)), |