Wait image cache saved before restarting

Author: Jack251970

Flow.Launcher.Infrastructure/Image/ImageLoader.cs

@@ -61,7 +61,7 @@ await Stopwatch.NormalAsync("|ImageLoader.Initialize|Preload images cost", async
             });
         }
 
-        public static async Task Save()
+        public static async Task SaveAsync()
         {
             await storageLock.WaitAsync();
 
@@ -77,6 +77,12 @@ await _storage.SaveAsync(ImageCache.EnumerateEntries()
             }
         }
 
+        public static async Task WaitSaveAsync()
+        {
+            await storageLock.WaitAsync();
+            storageLock.Release();
+        }
+
         private static async Task<List<(string, bool)>> LoadStorageToConcurrentDictionaryAsync()
         {
             await storageLock.WaitAsync();

Flow.Launcher/PublicAPIInstance.cs

@@ -57,7 +57,7 @@ public void ChangeQuery(string query, bool requery = false)
             _mainVM.ChangeQueryText(query, requery);
         }
 
-        public void RestartApp()
+        public async void RestartApp()
         {
             _mainVM.Hide();
 
@@ -66,6 +66,9 @@ public void RestartApp()
             // which will cause ungraceful exit
             SaveAppAllSettings();
 
+            // wait for all image caches to be saved
+            await ImageLoader.WaitSaveAsync();
+
             // Restart requires Squirrel's Update.exe to be present in the parent folder, 
             // it is only published from the project's release pipeline. When debugging without it,
             // the project may not restart or just terminates. This is expected.
@@ -88,7 +91,7 @@ public void SaveAppAllSettings()
             PluginManager.Save();
             _mainVM.Save();
             _settings.Save();
-            _ = ImageLoader.Save();
+            _ = ImageLoader.SaveAsync();
         }
 
         public Task ReloadAllPluginData() => PluginManager.ReloadDataAsync();