Quellcode durchsuchen

Bug fix: Extensions were not loaded when configuration is empty

(cherry picked from commit 4d9053616fda1d08fe619c591fd9f5144cf1f5de)

# Conflicts:
#	source/windows/WinConfiguration.cpp

Source commit: 5e968297c7ebcc08c2fe61f05f5f32f24ca0eb55
Martin Prikryl vor 7 Jahren
Ursprung
Commit
3326c408a2
1 geänderte Dateien mit 7 neuen und 6 gelöschten Zeilen
  1. 7 6
      source/windows/WinConfiguration.cpp

+ 7 - 6
source/windows/WinConfiguration.cpp

@@ -1138,8 +1138,9 @@ void __fastcall TWinConfiguration::LoadFrom(THierarchicalStorage * Storage)
 
 
     TCustomWinConfiguration::LoadFrom(Storage);
     TCustomWinConfiguration::LoadFrom(Storage);
 
 
-    // This needs to be done even if there's no Configuration key in the storage,
+    // Following needs to be done even if there's no Configuration key in the storage,
     // so it cannot be in LoadData
     // so it cannot be in LoadData
+
     int EditorCount = FEditorList->Count;
     int EditorCount = FEditorList->Count;
     if (EditorCount == 0)
     if (EditorCount == 0)
     {
     {
@@ -1181,6 +1182,11 @@ void __fastcall TWinConfiguration::LoadFrom(THierarchicalStorage * Storage)
         FEditorList->Add(AlternativeEditor);
         FEditorList->Add(AlternativeEditor);
       }
       }
     }
     }
+
+    // Additionally, this needs to be after Locale is loaded
+    LoadExtensionTranslations();
+    // and this after the ExtensionsDeleted and ExtensionsOrder are loaded
+    LoadExtensionList();
   }
   }
   __finally
   __finally
   {
   {
@@ -1406,11 +1412,6 @@ void __fastcall TWinConfiguration::LoadData(THierarchicalStorage * Storage)
   #pragma warn +eas
   #pragma warn +eas
   #undef KEYEX
   #undef KEYEX
 
 
-  // Load after Locale
-  LoadExtensionTranslations();
-  // Load after the ExtensionsDeleted and ExtensionsOrder
-  LoadExtensionList();
-
   // to reflect changes to PanelFont
   // to reflect changes to PanelFont
   UpdateIconFont();
   UpdateIconFont();