prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #3570 from Flow-Launcher/exitting_null

Browse source 
Fix main window null when checking exiting
This commit is contained in:
Jack Ye 2025-05-22 18:43:23 +08:00 committed by GitHub
commit dc0454b014
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Flow.Launcher/App.xaml.cs
View file

@ -32,7 +32,7 @@ namespace Flow.Launcher
#region Public Properties #region Public Properties
public static IPublicAPI API { get; private set; } public static IPublicAPI API { get; private set; }
public static bool Exiting => _mainWindow.CanClose; public static bool LoadingOrExiting => _mainWindow == null || _mainWindow.CanClose;
#endregion #endregion

2
Flow.Launcher/SettingWindow.xaml.cs
View file

@ -82,7 +82,7 @@ public partial class SettingWindow
_viewModel.PropertyChanged -= ViewModel_PropertyChanged; _viewModel.PropertyChanged -= ViewModel_PropertyChanged;
// If app is exiting, settings save is not needed because main window closing event will handle this // If app is exiting, settings save is not needed because main window closing event will handle this
if (App.Exiting) return; if (App.LoadingOrExiting) return;
// Save settings when window is closed // Save settings when window is closed
_settings.Save(); _settings.Save();
App.API.SavePluginSettings(); App.API.SavePluginSettings();

2
Flow.Launcher/ViewModel/MainViewModel.cs
View file

@ -1729,7 +1729,7 @@ namespace Flow.Launcher.ViewModel
public void Show() public void Show()
{ {
// When application is exiting, we should not show the main window // When application is exiting, we should not show the main window
if (App.Exiting) return; if (App.LoadingOrExiting) return;
// When application is exiting, the Application.Current will be null // When application is exiting, the Application.Current will be null
Application.Current?.Dispatcher.Invoke(() => Application.Current?.Dispatcher.Invoke(() =>

2
Flow.Launcher/WelcomeWindow.xaml.cs
View file

@ -96,7 +96,7 @@ namespace Flow.Launcher
private void Window_Closed(object sender, EventArgs e) private void Window_Closed(object sender, EventArgs e)
{ {
// If app is exiting, settings save is not needed because main window closing event will handle this // If app is exiting, settings save is not needed because main window closing event will handle this
if (App.Exiting) return; if (App.LoadingOrExiting) return;
// Save settings when window is closed // Save settings when window is closed
_settings.Save(); _settings.Save();
} }