From 2f256359cf616ad2a077bcad132691d5ce99e546 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Tue, 8 Oct 2013 00:53:58 +0000
Subject: Set window title/icon for Heretic/Hexen startup windows, to match the
 main game window.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2696
---
 src/heretic/d_main.c | 6 +++++-
 src/hexen/st_start.c | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/heretic/d_main.c b/src/heretic/d_main.c
index 6dc29cf7..5d9def79 100644
--- a/src/heretic/d_main.c
+++ b/src/heretic/d_main.c
@@ -250,7 +250,6 @@ void D_DoomLoop(void)
         sprintf(filename, "debug%i.txt", consoleplayer);
         debugfile = fopen(filename, "w");
     }
-    I_SetWindowTitle(gamedescription);
     I_GraphicsCheckCommandLine();
     I_InitGraphics();
     I_SetGrabMouseCallback(D_GrabMouseCallback);
@@ -638,6 +637,9 @@ void initStartup(void)
         return;
     }
 
+    I_InitWindowTitle();
+    I_InitWindowIcon();
+
     // Blit main screen
     textScreen = TXT_GetScreenData();
     loading = W_CacheLumpName(DEH_String("LOADING"), PU_CACHE);
@@ -1021,6 +1023,8 @@ void D_DoomMain(void)
         gamedescription = "Heretic (registered)";
     }
 
+    I_SetWindowTitle(gamedescription);
+
     savegamedir = M_GetSaveGameDir("heretic.wad");
 
     I_PrintStartupBanner(gamedescription);
diff --git a/src/hexen/st_start.c b/src/hexen/st_start.c
index 391e26a6..58df878e 100644
--- a/src/hexen/st_start.c
+++ b/src/hexen/st_start.c
@@ -32,6 +32,7 @@
 
 #include "h2def.h"
 #include "i_system.h"
+#include "i_video.h"
 #include "i_videohr.h"
 #include "s_sound.h"
 #include "st_start.h"
@@ -137,6 +138,7 @@ void ST_Init(void)
         if (I_SetVideoModeHR())
         {
             using_graphical_startup = true;
+            I_InitWindowIcon();
 
             S_StartSongName("orb", true);
 
-- 
cgit v1.2.3