Moved Unhandled Exception Handler to App.xaml.cs

Timthreetwelve · Jun 28, 2024 · 894e809 · 894e809
1 parent 4b44dd1
commit 894e809
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 33 deletions.
diff --git a/GetMyIP/App.xaml.cs b/GetMyIP/App.xaml.cs
@@ -56,6 +56,9 @@ protected override void OnStartup(StartupEventArgs e)
     {
         base.OnStartup(e);
 
+        // Unhandled exception handler
+        AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
+
         // Only allows a single instance of the application to run.
         SingleInstance.Create(AppInfo.AppName);
 
@@ -165,4 +168,32 @@ protected override void OnStartup(StartupEventArgs e)
             }
         }
     }
+
+    #region Unhandled Exception Handler
+    /// <summary>
+    /// Handles any exceptions that weren't caught by a try-catch statement.
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="args"></param>
+    /// <remarks>
+    /// This uses default message box.
+    /// </remarks>
+    internal static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs args)
+    {
+        _log.Error("Unhandled Exception");
+        Exception e = (Exception)args.ExceptionObject;
+        _log.Error(e.Message);
+        if (e.InnerException != null)
+        {
+            _log.Error(e.InnerException.ToString());
+        }
+        _log.Error(e.StackTrace);
+
+        string msg = string.Format($"{GetStringResource("MsgText_Error")}\n{e.Message}");
+        _ = MessageBox.Show(msg,
+            "Get My IP ERROR",
+            MessageBoxButton.OK,
+            MessageBoxImage.Error);
+    }
+    #endregion Unhandled Exception Handler
 }
diff --git a/GetMyIP/Helpers/MainWindowHelpers.cs b/GetMyIP/Helpers/MainWindowHelpers.cs
@@ -5,13 +5,13 @@ namespace GetMyIP.Helpers;
 internal static class MainWindowHelpers
 {
     #region Startup
-    internal static async Task GetMyIPStartUp(MainWindowHelpers mainWindowHelpers)
+    internal static async Task GetMyIPStartUp()
     {
         EventHandlers();
 
         if (!App.LogOnly)
         {
-            mainWindowHelpers.ApplyUISettings();
+            ApplyUISettings();
 
             string returnedJson = await IpHelpers.GetAllInfoAsync();
             IpHelpers.ProcessProvider(returnedJson, false);
@@ -123,9 +123,6 @@ public static string WindowTitleVersionAdmin()
     /// </summary>
     internal static void EventHandlers()
     {
-        // Unhandled exception handler
-        AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
-
         // Settings change events
         UserSettings.Setting!.PropertyChanged += SettingChange.UserSettingChanged!;
         TempSettings.Setting!.PropertyChanged += SettingChange.TempSettingChanged!;
@@ -277,34 +274,6 @@ public static T FindParent<T>(DependencyObject child) where T : DependencyObject
     }
     #endregion Find a parent of a control
 
-    #region Unhandled Exception Handler
-    /// <summary>
-    /// Handles any exceptions that weren't caught by a try-catch statement.
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="args"></param>
-    /// <remarks>
-    /// This uses default message box.
-    /// </remarks>
-    internal static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs args)
-    {
-        _log.Error("Unhandled Exception");
-        Exception e = (Exception)args.ExceptionObject;
-        _log.Error(e.Message);
-        if (e.InnerException != null)
-        {
-            _log.Error(e.InnerException.ToString());
-        }
-        _log.Error(e.StackTrace);
-
-        string msg = string.Format($"{GetStringResource("MsgText_Error")}\n{e.Message}");
-        _ = MessageBox.Show(msg,
-            "Get My IP ERROR",
-            MessageBoxButton.OK,
-            MessageBoxImage.Error);
-    }
-    #endregion Unhandled Exception Handler
-
     #region Set theme
     /// <summary>
     /// Gets the current theme