Fabian Maurer : wineconsole: When loading settings for an application, respect a 0 in FontSize.
Alexandre Julliard
julliard at winehq.org
Wed May 9 16:35:12 CDT 2018
Module: wine
Branch: master
Commit: 37654ceba8cf4bf2d654f94d51c7551f9f52af5c
URL: https://source.winehq.org/git/wine.git/?a=commit;h=37654ceba8cf4bf2d654f94d51c7551f9f52af5c
Author: Fabian Maurer <dark.shadow4 at web.de>
Date: Sun Apr 22 23:34:38 2018 +0200
wineconsole: When loading settings for an application, respect a 0 in FontSize.
Signed-off-by: Fabian Maurer <dark.shadow4 at web.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/wineconsole/registry.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/programs/wineconsole/registry.c b/programs/wineconsole/registry.c
index 080431a..92c53a7 100644
--- 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);
More information about the wine-cvs
mailing list