shithub: choc

Info  •  Files  •  Log  •  Branches

Undo previous change.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1417

--- a/setup/mainmenu.c

+++ b/setup/mainmenu.c

@@ -193,9 +193,6 @@

 {

     SetDisplayDriver();

-    TXT_SetDesktopTitle(PACKAGE_NAME " Setup ver " PACKAGE_VERSION);

-    SetIcon();

-    

     if (!TXT_Init())

     {

         fprintf(stderr, "Failed to initialise GUI\n");

@@ -202,6 +199,9 @@

         exit(-1);

     }

+    TXT_SetDesktopTitle(PACKAGE_NAME " Setup ver " PACKAGE_VERSION);

+    SetIcon();

+    

     MainMenu();

     TXT_GUIMainLoop();

--- a/src/i_system.c

+++ b/src/i_system.c

@@ -139,15 +139,15 @@

     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();