From 4a246cb6ef7d583fe630f7f5a8494ab97853c491 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Wed, 28 Dec 2016 15:57:50 +0100 Subject: Windows: cleaner code for handling of disabling of parent dialog when waiting dialog displayed --- src/Common/Dlgcode.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c index cc368df5..001d7102 100644 --- a/src/Common/Dlgcode.c +++ b/src/Common/Dlgcode.c @@ -7372,16 +7372,16 @@ void ShowWaitDialog(HWND hwnd, BOOL bUseHwndAsParent, WaitThreadProc callback, v else { BOOL bIsForeground = FALSE; + HWND creatorWnd = hwnd? hwnd : MainDlg; WaitDialogDisplaying = TRUE; - if (hwnd) + if (creatorWnd) { - if (GetForegroundWindow () == hwnd) + if (GetForegroundWindow () == creatorWnd) bIsForeground = TRUE; - EnableWindow (hwnd, FALSE); + EnableWindow (creatorWnd, FALSE); } - else - EnableWindow (MainDlg, FALSE); - finally_do_arg2 (HWND, hwnd, BOOL, bIsForeground, { if (finally_arg) {EnableWindow(finally_arg, TRUE); if (finally_arg2) BringToForeground (finally_arg);} else EnableWindow (MainDlg, TRUE);}); + + finally_do_arg2 (HWND, creatorWnd, BOOL, bIsForeground, { if (finally_arg) { EnableWindow(finally_arg, TRUE); if (finally_arg2) BringToForeground (finally_arg);}}); DialogBoxParamW (hInst, MAKEINTRESOURCEW (IDD_STATIC_MODAL_WAIT_DLG), hParent, -- cgit v1.2.3