From 7fee9a04c412840b6363b7d311d0bdf435feb5a3 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Thu, 11 Feb 2016 17:50:47 +0100
Subject: Windows: Avoid updating configuration after opening keyfile file
 dialog when /quit switch used without preferences parameter.

---
 src/Common/Keyfiles.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'src/Common')

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
@@ -40,6 +40,9 @@ using namespace VeraCrypt;
 
 BOOL HiddenFilesPresentInKeyfilePath = FALSE;
 
+#ifdef TCMOUNT
+extern BOOL UsePreferences;
+#endif
 
 KeyFile *KeyFileAdd (KeyFile *firstKeyFile, KeyFile *keyFile)
 {
@@ -613,9 +616,12 @@ BOOL CALLBACK KeyFilesDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 			{
 				bTryEmptyPasswordWhenKeyfileUsed = IsButtonChecked (GetDlgItem (hwndDlg, IDC_KEYFILES_TRY_EMPTY_PASSWORD));
 
-				WaitCursor ();
-				SaveSettings (hwndDlg);
-				NormalCursor ();
+				if (UsePreferences)
+				{
+					WaitCursor ();
+					SaveSettings (hwndDlg);
+					NormalCursor ();
+				}
 			}
 #endif
 			EndDialog (hwndDlg, IDOK);
-- 
cgit v1.2.3