wineconsole: When loading settings for an application, respect a 0 in FontSize.

Signed-off-by: Fabian Maurer <dark.shadow4@web.de> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wineconsole: When loading settings for an application, respect a 0 in FontSize.
37654ceb · Fabian Maurer · Alexandre Julliard · 7122c9d4 · 37654ceb
Commit 37654ceb authored Apr 22, 2018 by Fabian Maurer Committed by Alexandre Julliard May 09, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 2 deletions

registry.c programs/wineconsole/registry.c +11 -2

No files found.
--- a/programs/wineconsole/registry.c
+++ b/programs/wineconsole/registry.c
@@ -126,8 +126,17 @@ static void WINECON_RegLoadHelper(HKEY hConKey, struct config_data* cfg)
    count = sizeof(val);
    if (!RegQueryValueExW(hConKey, wszFontSize, 0, &type, (LPBYTE)&val, &count))
    {
-        cfg->cell_height = HIWORD(val);
-        cfg->cell_width  = LOWORD(val);
+        int height = HIWORD(val);
+        int width = LOWORD(val);
+        /* A value of zero reflects the default settings */
+        if (height != 0)
+        {
+            cfg->cell_height = height;
+        }
+        if (width != 0)
+        {
+            cfg->cell_width = width;
+        }
    }

    count = sizeof(val);