Fix from Robert de Bath which reorders the Windows initialisation

sequence: since init_fonts sets up ucsdata based on the available
Windows fonts, we should call it before passing ucsdata to term_init.

[originally from svn r9527]

diff --git a/windows/window.c b/windows/window.c
index df69db14b0d79e5c511c5cb0ef8ee25fdb2e807d..a0a526856d1520edee61848e63ae5b3bd502c091 100644 (file)
--- a/windows/window.c
+++ b/windows/window.c
@@ -698,6 +698,12 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
                              NULL, NULL, inst, NULL);
     }
 
                              NULL, NULL, inst, NULL);
     }
 

+    /*
+     * Initialise the fonts, simultaneously correcting the guesses
+     * for font_{width,height}.
+     */
+    init_fonts(0,0);
+

     /*
      * Initialise the terminal. (We have to do this _after_
      * creating the window, since the terminal is the first thing
     /*
      * Initialise the terminal. (We have to do this _after_
      * creating the window, since the terminal is the first thing


@@ -711,12 +717,6 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
              conf_get_int(conf, CONF_width),
              conf_get_int(conf, CONF_savelines));
 
              conf_get_int(conf, CONF_width),
              conf_get_int(conf, CONF_savelines));
 

-    /*
-     * Initialise the fonts, simultaneously correcting the guesses
-     * for font_{width,height}.
-     */
-    init_fonts(0,0);
-

     /*
      * Correct the guesses for extra_{width,height}.
      */
     /*
      * Correct the guesses for extra_{width,height}.
      */