Fixed an issue where DisabledDatabases would randomly be empty

microsoft · Dec 6, 2024 · eb78dbc · eb78dbc
1 parent a216e02
commit eb78dbc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/EventLogExpert.UI/Services/DatabaseService.cs b/src/EventLogExpert.UI/Services/DatabaseService.cs
@@ -14,9 +14,18 @@ public sealed partial class DatabaseService(
         enabledDatabaseCollectionProvider;
     private readonly IPreferencesProvider _preferences = preferences;
 
-    public IEnumerable<string> LoadedDatabases { get; private set; } = [];
+    public IEnumerable<string> LoadedDatabases
+    {
+        get
+        {
+            _loadedDatabases ??= SortDatabases(_enabledDatabaseCollectionProvider.GetEnabledDatabases());
+
+            return _loadedDatabases;
+        }
+    }
 
     private IEnumerable<string>? _disabledDatabases;
+    private IEnumerable<string>? _loadedDatabases;
 
     public IEnumerable<string> DisabledDatabases
     {
@@ -28,16 +37,16 @@ public IEnumerable<string> DisabledDatabases
         }
         private set
         {
-            _disabledDatabases = value;
-            _preferences.DisabledDatabasesPreference = value;
+            _disabledDatabases = value.ToList().AsReadOnly();
+            _preferences.DisabledDatabasesPreference = _disabledDatabases;
         }
     }
 
     public EventHandler<IEnumerable<string>>? LoadedDatabasesChanged { get; set; }
 
     public void LoadDatabases()
     {
-        LoadedDatabases = SortDatabases(_enabledDatabaseCollectionProvider.GetEnabledDatabases());
+        _loadedDatabases = SortDatabases(_enabledDatabaseCollectionProvider.GetEnabledDatabases());
 
         LoadedDatabasesChanged?.Invoke(this, LoadedDatabases);
     }

diff --git a/src/EventLogExpert.UI/Services/EnabledDatabaseCollectionProvider.cs b/src/EventLogExpert.UI/Services/EnabledDatabaseCollectionProvider.cs
@@ -62,7 +62,7 @@ public IList<string> GetEnabledDatabases()
         if (disabledDatabases.Any())
         {
             databases.RemoveAll(enabled => disabledDatabases
-                .Any(disabled => string.Equals(enabled, disabled, StringComparison.InvariantCultureIgnoreCase)));
+                .Any(disabled => string.Equals(enabled, disabled, StringComparison.OrdinalIgnoreCase)));
         }
 
         return databases;