Hugh McMaster : conhost: Don't compare the console config if the user cancels the dialog.
Alexandre Julliard
julliard at winehq.org
Wed Mar 2 15:39:51 CST 2022
Module: wine
Branch: master
Commit: dfb7428f20086d96bd43210593af11ec1dc196ef
URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfb7428f20086d96bd43210593af11ec1dc196ef
Author: Hugh McMaster <hugh.mcmaster at outlook.com>
Date: Wed Mar 2 23:54:19 2022 +1100
conhost: Don't compare the console config if the user cancels the dialog.
Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/conhost/window.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/programs/conhost/window.c b/programs/conhost/window.c
index 33ffb3915ed..abfc791c1ef 100644
--- a/programs/conhost/window.c
+++ b/programs/conhost/window.c
@@ -2036,7 +2036,8 @@ static BOOL config_dialog( struct console *console, BOOL current )
header.hwndParent = console->win;
header.u3.phpage = pages;
header.dwFlags = PSH_NOAPPLYNOW;
- PropertySheetW( &header );
+ if (PropertySheetW( &header ) < 1)
+ return TRUE;
if (!memcmp( &prev_config, &di.config, sizeof(prev_config) ))
return TRUE;
More information about the wine-cvs
mailing list