1 files changed, 7 insertions, 8 deletions
diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c
index 6157b189..f9b6f327 100644
--- a/src/Common/Dlgcode.c
+++ b/src/Common/Dlgcode.c
@@ -151,6 +151,10 @@ BOOL bMountFavoritesOnLogon = FALSE;
 BOOL bHistory = FALSE;
+#ifndef SETUP
+BOOL bLanguageSetInSetup = FALSE;
+#endif
 // Status of detection of hidden sectors (whole-system-drive encryption). 
 // 0 - Unknown/undetermined/completed, 1: Detection is or was in progress (but did not complete e.g. due to system crash).
 int HiddenSectorDetectionStatus = 0;    
@@ -2877,9 +2881,6 @@ void InitApp (HINSTANCE hInstance, wchar_t *lpszCommandLine)
        char langId[6]; 
        InitCommonControlsPtr InitCommonControlsFn = NULL;      
        wchar_t modPath[MAX_PATH];
-#ifndef SETUP
-        BOOL bLanguageSetInSetup = FALSE;
-#endif
        GetModuleFileNameW (NULL, modPath, ARRAYSIZE (modPath));
@@ -3053,9 +3054,12 @@ void InitApp (HINSTANCE hInstance, wchar_t *lpszCommandLine)
                }
        }
+#ifndef VCEXPANDER
        // delete the registry key created by the installer (if any)
        DeleteRegistryKey (HKEY_CURRENT_USER, L"Software\\VeraCrypt");
 #endif
+#endif
        
        if (langId[0] == 0)
        {
@@ -3077,11 +3081,6 @@ void InitApp (HINSTANCE hInstance, wchar_t *lpszCommandLine)
        LoadLanguageFile ();
 #ifndef SETUP
-        // Save language to XML configuration file if it has been selected in the setup
-        // so that other VeraCrypt programs will pick it up
-        if (bLanguageSetInSetup)
-                SaveSettings (NULL);
        // UAC elevation moniker cannot be used in portable mode.
        // A new instance of the application must be created with elevated privileges.
        if (IsNonInstallMode () && !IsAdmin () && IsUacSupported ())