Fix race condition with NotifyIcon disposal (#412)

pizzaboxer · Jul 23, 2023 · 1779056 · 1779056
1 parent cc39ee6
commit 1779056
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Bloxstrap/App.xaml.cs b/Bloxstrap/App.xaml.cs
@@ -317,7 +317,7 @@ protected override void OnStartup(StartupEventArgs e)
  // 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();
 
- if (Settings.Prop.EnableActivityTracking)
+ if (!IsNoLaunch && Settings.Prop.EnableActivityTracking)
  NotifyIcon?.InitializeContextMenu();
 
  bootstrapperTask.Wait();

diff --git a/Bloxstrap/UI/NotifyIconWrapper.cs b/Bloxstrap/UI/NotifyIconWrapper.cs
@@ -134,7 +134,7 @@ public void Dispose()
  App.Logger.WriteLine($"[NotifyIconWrapper::Dispose] Disposing NotifyIcon");
 
  _menuContainer?.Dispatcher.Invoke(_menuContainer.Close);
- _notifyIcon.Dispose();
+ _notifyIcon?.Dispose();
 
  _disposed = true;