Defer Store initialization

dalyIsaac · May 28, 2024 · 46ce22d · 46ce22d
1 parent 0ad08dd
commit 46ce22d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Whim.Bar/BarPlugin.cs b/src/Whim.Bar/BarPlugin.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text.Json;
 using Windows.Win32.Graphics.Dwm;
@@ -44,7 +44,7 @@ public void PostInitialize()
 		foreach (IMonitor monitor in _context.MonitorManager)
 		{
 			BarWindow barWindow = new(_context, _barConfig, monitor);
-			_monitorBarMap.Add(monitor, barWindow);
+			_monitorBarMap[monitor] = barWindow;
 		}
 
 		ShowAll();

diff --git a/src/Whim/Context/Context.cs b/src/Whim/Context/Context.cs
@@ -95,14 +95,14 @@ public void Initialize()
 		// Initialize the managers.
 		Logger.Debug("Initializing...");
 		_internalContext.PreInitialize();
-		Store.Initialize();
 		PluginManager.PreInitialize();
 
 		NotificationManager.Initialize();
 		MonitorManager.Initialize();
 		WorkspaceManager.Initialize();
 		WindowManager.Initialize();
 
+		Store.Initialize();
 		Butler.Initialize();
 
 		WindowManager.PostInitialize();