projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hung-Te Lin spotted that the `multi-changesettings-crash' workaround for Windows
[u/mdw/putty]
/
windows
/
window.c
diff --git
a/windows/window.c
b/windows/window.c
index
fedcc35
..
e6c0e39
100644
(file)
--- a/
windows/window.c
+++ b/
windows/window.c
@@
-108,7
+108,7
@@
static void *backhandle;
static struct unicode_data ucsdata;
static int session_closed;
static struct unicode_data ucsdata;
static int session_closed;
-static int reconfiguring;
+static int reconfiguring
= FALSE
;
static const struct telnet_special *specials;
static int n_specials;
static const struct telnet_special *specials;
static int n_specials;
@@
-1968,16
+1968,20
@@
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
{
Config prev_cfg;
int init_lvl = 1;
{
Config prev_cfg;
int init_lvl = 1;
+ int reconfig_result;
if (reconfiguring)
if (reconfiguring)
- break;
+
break;
else
else
- reconfiguring = TRUE;
+
reconfiguring = TRUE;
GetWindowText(hwnd, cfg.wintitle, sizeof(cfg.wintitle));
prev_cfg = cfg;
GetWindowText(hwnd, cfg.wintitle, sizeof(cfg.wintitle));
prev_cfg = cfg;
- if (!do_reconfig(hwnd, back ? back->cfg_info(backhandle) : 0))
+ reconfig_result =
+ !do_reconfig(hwnd, back ? back->cfg_info(backhandle) : 0);
+ reconfiguring = FALSE;
+ if (!reconfig_result)
break;
{
break;
{
@@
-2110,7
+2114,6
@@
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
InvalidateRect(hwnd, NULL, TRUE);
reset_window(init_lvl);
net_pending_errors();
InvalidateRect(hwnd, NULL, TRUE);
reset_window(init_lvl);
net_pending_errors();
- reconfiguring = FALSE;
}
break;
case IDM_COPYALL:
}
break;
case IDM_COPYALL: