From d095b3c35c8b8a597dbff99dd34ff19bfa3986fe Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sun, 13 May 2012 15:59:24 +0000 Subject: [PATCH] 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] --- windows/window.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/windows/window.c b/windows/window.c index df69db14..a0a52685 100644 --- 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); } + /* + * 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 @@ -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)); - /* - * Initialise the fonts, simultaneously correcting the guesses - * for font_{width,height}. - */ - init_fonts(0,0); - /* * Correct the guesses for extra_{width,height}. */