diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-09-10 23:25:51 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-09-10 23:25:51 +0300 |
| commit | b5a5f804e6beac792370a9aead9f951e67655b65 (patch) | |
| tree | e20c6d6ab2b494c689552c2abc3cf22dbeec6ebb /src/gui | |
| parent | 7fd1401d915ee91c808695ca1f3647ca7a258a1f (diff) | |
| download | mv-b5a5f804e6beac792370a9aead9f951e67655b65.tar.gz mv-b5a5f804e6beac792370a9aead9f951e67655b65.tar.bz2 mv-b5a5f804e6beac792370a9aead9f951e67655b65.tar.xz mv-b5a5f804e6beac792370a9aead9f951e67655b65.zip | |
Fix loading icon two times.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/windowmanager.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp index 054f19f12..c7b81d1a9 100644 --- a/src/gui/windowmanager.cpp +++ b/src/gui/windowmanager.cpp @@ -219,9 +219,6 @@ void WindowManager::initTitle() SDL::SetWindowTitle(mainGraphics->getWindow(), settings.windowCaption.c_str()); -#ifndef WIN32 - setIcon(); -#endif // WIN32 } void WindowManager::updateTitle() @@ -412,6 +409,7 @@ void WindowManager::newChatMessage() void WindowManager::setIcon() { +#ifndef ANDROID std::string iconFile = branding.getValue("appIcon", "icons/manaplus"); #ifdef WIN32 iconFile.append(".ico"); @@ -468,6 +466,7 @@ void WindowManager::setIcon() SDL::SetWindowIcon(mainGraphics->getWindow(), mIcon); } #endif // WIN32 +#endif // ANDROID } bool WindowManager::isKeyboardVisible() |