SPAWNRYS/bloxstrap
1
0
Fork 0
mirror of https://github.com/bloxstraplabs/bloxstrap.git synced 2025-06-23 23:00:23 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix race condition with NotifyIcon disposal (#412)

Browse Source
This commit is contained in:
pizzaboxer 2023-07-23 08:33:29 +01:00
parent cc39ee6e8a
commit 1779056655
No known key found for this signature in database
GPG Key ID: 59D4A1DBAD0F2BA8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bloxstrap/App.xaml.cs
View File

@ -317,7 +317,7 @@ namespace Bloxstrap
// this ordering is very important as all wpf windows are shown as modal dialogs, mess it up and you'll end up blocking input to one of them // this ordering is very important as all wpf windows are shown as modal dialogs, mess it up and you'll end up blocking input to one of them
dialog?.ShowBootstrapper(); dialog?.ShowBootstrapper();
if (Settings.Prop.EnableActivityTracking) if (!IsNoLaunch && Settings.Prop.EnableActivityTracking)
NotifyIcon?.InitializeContextMenu(); NotifyIcon?.InitializeContextMenu();
bootstrapperTask.Wait(); bootstrapperTask.Wait();

2
Bloxstrap/UI/NotifyIconWrapper.cs
View File

@ -134,7 +134,7 @@ namespace Bloxstrap.UI
App.Logger.WriteLine($"[NotifyIconWrapper::Dispose] Disposing NotifyIcon"); App.Logger.WriteLine($"[NotifyIconWrapper::Dispose] Disposing NotifyIcon");
_menuContainer?.Dispatcher.Invoke(_menuContainer.Close); _menuContainer?.Dispatcher.Invoke(_menuContainer.Close);
_notifyIcon.Dispose(); _notifyIcon?.Dispose();
_disposed = true; _disposed = true;