From b5a5f804e6beac792370a9aead9f951e67655b65 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 10 Sep 2017 23:25:51 +0300
Subject: Fix loading icon two times.

---
 src/gui/windowmanager.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/gui')

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()
-- 
cgit v1.2.3-60-g2f50