diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-02-11 17:50:47 +0100 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-02-12 00:04:25 +0100 |
| commit | 7fee9a04c412840b6363b7d311d0bdf435feb5a3 (patch) | |
| tree | be6e3fc579f05fda20c859d5519cc38119d5b935 | |
| parent | 39fb2edc25f2703744932f25d956bf7af604fc5f (diff) | |
| download | VeraCrypt-7fee9a04c412840b6363b7d311d0bdf435feb5a3.tar.gz VeraCrypt-7fee9a04c412840b6363b7d311d0bdf435feb5a3.zip | |
Windows: Avoid updating configuration after opening keyfile file dialog when /quit switch used without preferences parameter.
| -rw-r--r-- | src/Common/Keyfiles.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/Common/Keyfiles.c b/src/Common/Keyfiles.c index 9db05266..c634efaf 100644 --- a/src/Common/Keyfiles.c +++ b/src/Common/Keyfiles.c @@ -39,8 +39,11 @@ using namespace VeraCrypt; BOOL HiddenFilesPresentInKeyfilePath = FALSE;
+#ifdef TCMOUNT
+extern BOOL UsePreferences;
+#endif
KeyFile *KeyFileAdd (KeyFile *firstKeyFile, KeyFile *keyFile)
{
KeyFile *kf = firstKeyFile;
@@ -612,11 +615,14 @@ BOOL CALLBACK KeyFilesDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa if (IsWindowVisible (GetDlgItem (hwndDlg, IDC_KEYFILES_TRY_EMPTY_PASSWORD)))
{
bTryEmptyPasswordWhenKeyfileUsed = IsButtonChecked (GetDlgItem (hwndDlg, IDC_KEYFILES_TRY_EMPTY_PASSWORD));
- WaitCursor ();
- SaveSettings (hwndDlg);
- NormalCursor ();
+ if (UsePreferences)
+ {
+ WaitCursor ();
+ SaveSettings (hwndDlg);
+ NormalCursor ();
+ }
}
#endif
EndDialog (hwndDlg, IDOK);
return 1;
|