Merge branch '0.5' of git://gitorious.org/mana/mana into 0.5

1 files changed, 17 insertions, 5 deletions

diff --git a/src/client.cpp b/src/client.cpp
index 110420d5..b57c3ae8 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -299,17 +299,29 @@ Client::Client(const Options &options):
     // Add the local data directory to PhysicsFS search path
     resman->addToSearchPath(mLocalDataDir, false);
 
+    std::string iconFile = branding.getValue("appIcon", "icons/mana");
+#ifdef WIN32
+    iconFile += ".ico";
+#else
+    iconFile += ".png";
+#endif
+    iconFile = resman->getPath(iconFile);
+    logger->log("Loading icon from file: %s", iconFile.c_str());
 #ifdef WIN32
     static SDL_SysWMinfo pInfo;
     SDL_GetWMInfo(&pInfo);
-    HICON icon = LoadIcon(GetModuleHandle(NULL), "A");
+    // Attempt to load icon from .ico file
+    HICON icon = (HICON) LoadImage(NULL,
+                                   iconFile.c_str(),
+                                   IMAGE_ICON, 64, 64, LR_LOADFROMFILE);
+    // If it's failing, we load the default resource file.
+    if (!icon)
+        icon = LoadIcon(GetModuleHandle(NULL), "A");
+
     if (icon)
-    {
         SetClassLong(pInfo.window, GCL_HICON, (LONG) icon);
-    }
 #else
-    mIcon = IMG_Load(resman->getPath(
-            branding.getValue("appIcon", "icons/mana.png")).c_str());
+    mIcon = IMG_Load(iconFile.c_str());
     if (mIcon)
     {
         SDL_SetAlpha(mIcon, SDL_SRCALPHA, SDL_ALPHA_OPAQUE);