Fix deskband logging regression

srwi · srwi · commit 664009ca0983 · 2024-09-07T23:09:07.000+02:00
diff --git a/EverythingToolbar/Helpers/ToolbarLogger.cs b/EverythingToolbar/Helpers/ToolbarLogger.cs
@@ -47,10 +47,15 @@ private static void InitializeExceptionLoggers(ILogger logger)
             {
                 logger.Error((Exception)args.ExceptionObject, "Unhandled exception");
             };
-            Application.Current.DispatcherUnhandledException += (sender, args) =>
+
+            if (Application.Current != null)
             {
-                logger.Error(args.Exception, "Unhandled exception on UI thread");
-            };
+                // Not applicable for deskband
+                Application.Current.DispatcherUnhandledException += (sender, args) =>
+                {
+                    logger.Error(args.Exception, "Unhandled exception on UI thread");
+                };
+            }
         }
 
         private static void ConfigureLogger()

Original file line number	Diff line number	Diff line change
`@@ -47,10 +47,15 @@ private static void InitializeExceptionLoggers(ILogger logger)`
`47`	`47`	`{`
`48`	`48`	`logger.Error((Exception)args.ExceptionObject, "Unhandled exception");`
`49`	`49`	`};`
`50`		`- Application.Current.DispatcherUnhandledException += (sender, args) =>`
	`50`	`+`
	`51`	`+ if (Application.Current != null)`
`51`	`52`	`{`
`52`		`- logger.Error(args.Exception, "Unhandled exception on UI thread");`
`53`		`- };`
	`53`	`+ // Not applicable for deskband`
	`54`	`+ Application.Current.DispatcherUnhandledException += (sender, args) =>`
	`55`	`+ {`
	`56`	`+ logger.Error(args.Exception, "Unhandled exception on UI thread");`
	`57`	`+ };`
	`58`	`+ }`
`54`	`59`	`}`
`55`	`60`
`56`	`61`	`private static void ConfigureLogger()`