nihilist/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt synced 2024-11-30 23:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Windows: cleaner code for handling of disabling of parent dialog when waiting dialog displayed

Browse Source
This commit is contained in:
Mounir IDRASSI 2016-12-28 15:57:50 +01:00
parent 5493de11d5
commit 4a246cb6ef
No known key found for this signature in database
GPG Key ID: DD0C382D5FCFB8FC
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Common/Dlgcode.c
View File

@ -7372,16 +7372,16 @@ void ShowWaitDialog(HWND hwnd, BOOL bUseHwndAsParent, WaitThreadProc callback, v
else else
{ {
BOOL bIsForeground = FALSE; BOOL bIsForeground = FALSE;
HWND creatorWnd = hwnd? hwnd : MainDlg;
WaitDialogDisplaying = TRUE; WaitDialogDisplaying = TRUE;
if (hwnd) if (creatorWnd)
{ {
if (GetForegroundWindow () == hwnd) if (GetForegroundWindow () == creatorWnd)
bIsForeground = TRUE; bIsForeground = TRUE;
EnableWindow (hwnd, FALSE); EnableWindow (creatorWnd, FALSE);
} }
else
EnableWindow (MainDlg, FALSE); finally_do_arg2 (HWND, creatorWnd, BOOL, bIsForeground, { if (finally_arg) { EnableWindow(finally_arg, TRUE); if (finally_arg2) BringToForeground (finally_arg);}});
finally_do_arg2 (HWND, hwnd, BOOL, bIsForeground, { if (finally_arg) {EnableWindow(finally_arg, TRUE); if (finally_arg2) BringToForeground (finally_arg);} else EnableWindow (MainDlg, TRUE);});
DialogBoxParamW (hInst, DialogBoxParamW (hInst,
MAKEINTRESOURCEW (IDD_STATIC_MODAL_WAIT_DLG), hParent, MAKEINTRESOURCEW (IDD_STATIC_MODAL_WAIT_DLG), hParent,