[PATCH v4 4/4] conhost: Prioritize font charset when selecting initial font.

[Piotr Caban]

From: Piotr Caban

---
 programs/conhost/window.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/programs/conhost/window.c b/programs/conhost/window.c
index 592a5141b89..dedd48a9fc8 100644
--- a/programs/conhost/window.c
+++ b/programs/conhost/window.c
@@ -819,11 +819,11 @@ static BOOL validate_font( struct console *console, const LOGFONTW *lf,
                 < GetSystemMetrics(SM_CYSCREEN))
             w |= 0x4;
     }
-    if ((lf->lfCharSet == DEFAULT_CHARSET || lf->lfCharSet == console->window->ui_charset)
-            && (!tm || tm->tmCharSet == DEFAULT_CHARSET || tm->tmCharSet == console->window->ui_charset))
-        w |= 0x8;
     if ((lf->lfPitchAndFamily & 3) == FIXED_PITCH
             && (!tm || (!tm->tmItalic && !tm->tmUnderlined && !tm->tmStruckOut)))
+        w |= 0x8;
+    if (lf->lfCharSet == console->window->ui_charset
+            && (!tm || tm->tmCharSet == console->window->ui_charset))
         w |= 0x10;
     if (lf->lfFaceName[0] != '@')
         w |= 0x20;