Fix FirstChanceException handling

ipphone · Apr 17, 2017 · 2cb212c · 2cb212c
1 parent 759ac4e
commit 2cb212c
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/ContactPoint/Program.cs b/ContactPoint/Program.cs
@@ -379,12 +379,13 @@ static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEv
 
         static void CurrentDomain_FirstChanceException(object sender, FirstChanceExceptionEventArgs e)
         {
-#if !DEBUG
-            CatchUnhandledException(sender, e.Exception, "First chance exception from '{0}'");
-#endif
+            if (e.Exception != null)
+            {
+                CatchUnhandledException(sender, e.Exception, "First chance exception from '{0}'", false);
+            }
         }
 
-        static void CatchUnhandledException(object sender, Exception e, string message)
+        static void CatchUnhandledException(object sender, Exception e, string message, bool showExceptionReporter = true)
         {
             try
             {
@@ -403,18 +404,18 @@ static void CatchUnhandledException(object sender, Exception e, string message)
 
             Logger.LogError(e);
 
+            if (!showExceptionReporter || _disableExceptionReporter || ExceptionReporter == null || !Application.MessageLoop)
+            {
+                return;
+            }
+
 #if DEBUG
             if (Debugger.IsAttached)
             {
                 Debugger.Break();
             }
 #endif
 
-            if (_disableExceptionReporter || ExceptionReporter == null || !Application.MessageLoop)
-            {
-                return;
-            }
-
             try
             {
                 TakeScreenshot(ExceptionReporter);