From aed280e13947099544f584077e9cd893ddeaf9e5 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Wed, 10 Dec 2008 00:42:49 +0000
Subject: Set icon before calling TXT_Init, for setup and ENDOOM screens.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1416
---
 setup/mainmenu.c | 6 +++---
 src/i_system.c   | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/setup/mainmenu.c b/setup/mainmenu.c
index d4dfe0db..55341c81 100644
--- a/setup/mainmenu.c
+++ b/setup/mainmenu.c
@@ -193,15 +193,15 @@ static void RunGUI(void)
 {
     SetDisplayDriver();
 
+    TXT_SetDesktopTitle(PACKAGE_NAME " Setup ver " PACKAGE_VERSION);
+    SetIcon();
+    
     if (!TXT_Init())
     {
         fprintf(stderr, "Failed to initialise GUI\n");
         exit(-1);
     }
 
-    TXT_SetDesktopTitle(PACKAGE_NAME " Setup ver " PACKAGE_VERSION);
-    SetIcon();
-    
     MainMenu();
 
     TXT_GUIMainLoop();
diff --git a/src/i_system.c b/src/i_system.c
index fe596a60..282000ed 100644
--- a/src/i_system.c
+++ b/src/i_system.c
@@ -139,15 +139,15 @@ void I_Endoom(void)
 
     endoom_data = W_CacheLumpName(DEH_String("ENDOOM"), PU_STATIC);
 
-    // Set up text mode screen
-
-    TXT_Init();
-
     // Make sure the new window has the right title and icon
  
     I_SetWindowCaption();
     I_SetWindowIcon();
     
+    // Set up text mode screen
+
+    TXT_Init();
+
     // Write the data to the screen memory
   
     screendata = TXT_GetScreenData();
-- 
cgit v1.2.3