From 51fa913783cce22eacb439c8d671c7aaa1647898 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 10 Jan 2014 02:52:31 +0300 Subject: fix icon loading on windows. --- src/client.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/client.cpp') diff --git a/src/client.cpp b/src/client.cpp index 3f049340f..ae76813ab 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -2991,7 +2991,10 @@ void Client::setIcon() #ifdef WIN32 static SDL_SysWMinfo pInfo; - SDL::getWindowWMInfo(mainGraphics->getWindow(), &pInfo); + if (mainGraphics) + SDL::getWindowWMInfo(mainGraphics->getWindow(), &pInfo); + else + SDL::getWindowWMInfo(nullptr, &pInfo); // Attempt to load icon from .ico file HICON icon = (HICON) LoadImage(nullptr, iconFile.c_str(), IMAGE_ICON, 64, 64, LR_LOADFROMFILE); -- cgit v1.2.3-60-g2f50