Cleanup & Improve

Author: Jack251970

Flow.Launcher/App.xaml.cs

@@ -25,7 +25,7 @@
 
 namespace Flow.Launcher
 {
-    public partial class App : IAsyncDisposable, ISingleInstanceApp
+    public partial class App : IDisposable, ISingleInstanceApp
     {
         #region Public Properties
 
@@ -122,10 +122,9 @@ public static void Main()
         {
             if (SingleInstance<App>.InitializeAsFirstInstance())
             {
-                var application = new App();
+                using var application = new App();
                 application.InitializeComponent();
                 application.Run();
-                application.DisposeAsync().AsTask().GetAwaiter().GetResult();
             }
         }
 
@@ -240,22 +239,22 @@ private void AutoUpdates()
 
         private void RegisterExitEvents()
         {
-            AppDomain.CurrentDomain.ProcessExit += async (s, e) =>
+            AppDomain.CurrentDomain.ProcessExit += (s, e) =>
             {
                 Log.Info("|App.RegisterExitEvents|Process Exit");
-                await DisposeAsync();
+                Dispose();
             };
 
-            Current.Exit += async (s, e) =>
+            Current.Exit += (s, e) =>
             {
                 Log.Info("|App.RegisterExitEvents|Application Exit");
-                await DisposeAsync();
+                Dispose();
             };
 
-            Current.SessionEnding += async (s, e) =>
+            Current.SessionEnding += (s, e) =>
             {
                 Log.Info("|App.RegisterExitEvents|Session Ending");
-                await DisposeAsync();
+                Dispose();
             };
         }
 
@@ -279,9 +278,9 @@ private static void RegisterAppDomainExceptions()
 
         #endregion
 
-        #region IAsyncDisposable
+        #region IDisposable
 
-        protected virtual async ValueTask DisposeAsync(bool disposing)
+        protected virtual void Dispose(bool disposing)
         {
             // Prevent two disposes at the same time.
             lock (_disposingLock)
@@ -299,9 +298,7 @@ protected virtual async ValueTask DisposeAsync(bool disposing)
                 _disposed = true;
             }
 
-            await Task.Delay(10000);
-
-            await Stopwatch.NormalAsync("|App.Dispose|Dispose cost", async () =>
+            Stopwatch.Normal("|App.Dispose|Dispose cost", async () =>
             {
                 Log.Info("|App.Dispose|Begin Flow Launcher dispose ----------------------------------------------------");
 
@@ -310,19 +307,19 @@ await Stopwatch.NormalAsync("|App.Dispose|Dispose cost", async () =>
                     API?.SaveAppAllSettings();
                     await PluginManager.DisposePluginsAsync();
 
-                    // Dispose needs to be called on the main Windows thread, since some resources owned by the thread need to be disposed.
-                    await _mainWindow?.Dispatcher.InvokeAsync(_mainWindow.Dispose);
+                    // Dispose needs to be called on the main Windows thread,
+                    // since some resources owned by the thread need to be disposed.
+                    _mainWindow?.Dispatcher.Invoke(_mainWindow.Dispose);
                     _mainVM?.Dispose();
                 }
 
                 Log.Info("|App.Dispose|End Flow Launcher dispose ----------------------------------------------------");
             });
         }
 
-        public async ValueTask DisposeAsync()
+        public void Dispose()
         {
-            // Do not change this code. Put cleanup code in 'DisposeAsync(bool disposing)' method
-            await DisposeAsync(disposing: true);
+            Dispose(disposing: true);
             GC.SuppressFinalize(this);
         }
 

Flow.Launcher/MainWindow.xaml.cs

@@ -42,7 +42,7 @@ public partial class MainWindow : IDisposable
         private readonly ContextMenu contextMenu = new();
         private readonly MainViewModel _viewModel;
 
-        // Window Event : Key Event
+        // Window Event: Key Event
         private bool isArrowKeyPressed = false;
 
         // Window Sound Effects
@@ -233,7 +233,6 @@ private async void OnLoaded(object sender, RoutedEventArgs _)
 
         private void OnClosing(object sender, CancelEventArgs e)
         {
-            _viewModel.Save();
             _notifyIcon.Visible = false;
             Notification.Uninstall();
         }