Dispose notify icon in App

Author: Jack251970

Flow.Launcher/App.xaml.cs

@@ -372,6 +372,13 @@ protected virtual void Dispose(bool disposing)
 
                 if (disposing)
                 {
+                    // Dispose notify icon first to prevent it from showing balloon tip after main window is closed
+                    if (NotifyIcon != null)
+                    {
+                        NotifyIcon.Visible = false;
+                        NotifyIcon.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);

Flow.Launcher/MainWindow.xaml.cs

@@ -1313,7 +1313,6 @@ protected virtual void Dispose(bool disposing)
                 if (disposing)
                 {
                     _hwndSource?.Dispose();
-                    App.NotifyIcon?.Dispose();
                     animationSoundWMP?.Close();
                     animationSoundWPF?.Dispose();
                     ModernWpf.ThemeManager.Current.ActualApplicationThemeChanged -= ThemeManager_ActualApplicationThemeChanged;