From f2d1d2b43a0ebdb625aea94cb4b8ff7fce6bf8f4 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 4 Jan 2014 14:42:16 +0300
Subject: fix window icon in windows.

---
 src/client.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src')

diff --git a/src/client.cpp b/src/client.cpp
index 27c55dcee..43c474dab 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -356,6 +356,10 @@ void Client::gameInit()
     SDL_EventState(SDL_SYSWMEVENT, SDL_IGNORE);
     SDL_EventState(SDL_USEREVENT, SDL_IGNORE);
 
+#ifdef WIN32
+    setIcon();
+#endif
+
     initGraphics();
     extractDataDir();
     mountDataDir();
@@ -586,7 +590,9 @@ void Client::initTitle()
     }
 
     SDL::SetWindowTitle(mainGraphics->getWindow(), mCaption.c_str());
+#ifndef WIN32
     setIcon();
+#endif
 }
 
 #ifdef ANDROID
@@ -2965,6 +2971,8 @@ void Client::setIcon()
     // Attempt to load icon from .ico file
     HICON icon = (HICON) LoadImage(nullptr, iconFile.c_str(),
         IMAGE_ICON, 64, 64, LR_LOADFROMFILE);
+    if (!icon)
+        logger->log("icon load error");
     // If it's failing, we load the default resource file.
     if (!icon)
         icon = LoadIcon(GetModuleHandle(nullptr), "A");
-- 
cgit v1.2.3-60-g2f50