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

Cleanup & Improve

Browse source
This commit is contained in:
Jack251970 2025-03-22 10:24:34 +08:00
parent 5b29dedcbe
commit 09bc2bc48b
2 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,7 +25,7 @@ using Stopwatch = Flow.Launcher.Infrastructure.Stopwatch;
namespace Flow.Launcher
{
public partial class App : IAsyncDisposable, ISingleInstanceApp
public partial class App : IDisposable, ISingleInstanceApp
{
#region Public Properties
@ -122,10 +122,9 @@ namespace Flow.Launcher
{
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 @@ namespace Flow.Launcher
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 @@ namespace Flow.Launcher
#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 @@ namespace Flow.Launcher
_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,8 +307,9 @@ namespace Flow.Launcher
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();
}
@ -319,10 +317,9 @@ namespace Flow.Launcher
});
}
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);
}

3
Flow.Launcher/MainWindow.xaml.cs
View file

@ -42,7 +42,7 @@ namespace Flow.Launcher
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 @@ namespace Flow.Launcher
private void OnClosing(object sender, CancelEventArgs e)
{
_viewModel.Save();
_notifyIcon.Visible = false;
Notification.Uninstall();
}