Add soft termination for settings window

pizzaboxer · Sep 27, 2024 · fe04b46 · fe04b46
1 parent 81c6512
commit fe04b46
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/Bloxstrap/App.xaml.cs b/Bloxstrap/App.xaml.cs
@@ -66,6 +66,15 @@ public static void Terminate(ErrorCode exitCode = ErrorCode.ERROR_SUCCESS)
  Environment.Exit(exitCodeNum);
  }
 
+ public static void SoftTerminate(ErrorCode exitCode = ErrorCode.ERROR_SUCCESS)
+ {
+ int exitCodeNum = (int)exitCode;
+
+ Logger.WriteLine("App::SoftTerminate", $"Terminating with exit code {exitCodeNum} ({exitCode})");
+
+ Current.Dispatcher.Invoke(() => Current.Shutdown(exitCodeNum));
+ }
+
  void GlobalExceptionHandler(object sender, DispatcherUnhandledExceptionEventArgs e)
  {
  e.Handled = true;

diff --git a/Bloxstrap/UI/Elements/Settings/MainWindow.xaml.cs b/Bloxstrap/UI/Elements/Settings/MainWindow.xaml.cs
@@ -102,7 +102,7 @@ private void WpfUiWindow_Closing(object sender, CancelEventArgs e)
  App.State.Save();
 
  if (!e.Cancel)
- App.Terminate();
+ App.SoftTerminate();
  }
  }
 }