diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-10-15 01:18:25 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-10-15 01:36:15 +0200 |
| commit | 41819270bbb7129a5568125a6b0cbfdf719680bd (patch) | |
| tree | e47c9b527b2b0e89fbfe4f38045f8d67aff3e038 /src/Mount/Mount.c | |
| parent | 8342d0d616a8340bc358b19146f1b2d8cdf41af8 (diff) | |
| download | VeraCrypt-41819270bbb7129a5568125a6b0cbfdf719680bd.tar.gz VeraCrypt-41819270bbb7129a5568125a6b0cbfdf719680bd.zip | |
Windows: Solve lost focus for application after displaying the waiting dialog
Diffstat (limited to 'src/Mount/Mount.c')
| -rw-r--r-- | src/Mount/Mount.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c index 9ee58151..cd82c08e 100644 --- a/src/Mount/Mount.c +++ b/src/Mount/Mount.c @@ -4598,9 +4598,10 @@ static BOOL Dismount (HWND hwndDlg, int nDosDriveNo) void __cdecl mountThreadFunction (void *hwndDlgArg)
{
HWND hwndDlg =(HWND) hwndDlgArg;
+ BOOL bIsForeground = (GetForegroundWindow () == hwndDlg)? TRUE : FALSE;
// Disable parent dialog during processing to avoid user interaction
EnableWindow(hwndDlg, FALSE);
- finally_do_arg (HWND, hwndDlg, { EnableWindow(finally_arg, TRUE); bPrebootPasswordDlgMode = FALSE;});
+ finally_do_arg2 (HWND, hwndDlg, BOOL, bIsForeground, { EnableWindow(finally_arg, TRUE); if (finally_arg2) BringToForeground (finally_arg); bPrebootPasswordDlgMode = FALSE;});
Mount (hwndDlg, 0, 0, -1);
}
@@ -9102,7 +9103,7 @@ void CALLBACK mountFavoriteVolumeCallbackFunction (void *pArg, HWND hwnd) void __cdecl mountFavoriteVolumeThreadFunction (void *pArg)
{
- ShowWaitDialog (NULL, FALSE, mountFavoriteVolumeCallbackFunction, pArg);
+ ShowWaitDialog (MainDlg, FALSE, mountFavoriteVolumeCallbackFunction, pArg);
}
static void SaveDefaultKeyFilesParam (HWND hwnd)
|