fix crash with nogui on windows

wesnoth · Mar 5, 2016 · 36ac558 · 36ac558
1 parent 6662f4e
commit 36ac558
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/desktop/windows_tray_notification.cpp b/src/desktop/windows_tray_notification.cpp
@@ -193,8 +193,9 @@ HWND windows_tray_notification::get_window_handle()
 #if !SDL_VERSION_ATLEAST(2, 0, 0)
 	if (SDL_GetWMInfo(&wmInfo) != 1) {
 #else
+	sdl::twindow* window = CVideo::get_singleton().get_window();
 	// SDL 1.2 keeps track of window handles internally whereas SDL 2.0 allows the caller control over which window to use
-	if (SDL_GetWindowWMInfo (static_cast<SDL_Window *> (*CVideo::get_singleton().get_window()), &wmInfo) != SDL_TRUE) {
+	if (!window || SDL_GetWindowWMInfo (static_cast<SDL_Window *> (*window), &wmInfo) != SDL_TRUE) {
 #endif
 		return NULL;
 	}