Merge pull request #408 from Cephas369/dev

Fixed exception handler preventing debuggers from catching exceptions
BUTR · Sep 24, 2024 · 47a6037 · 47a6037
2 parents 8f30b66 + eb141ca
commit 47a6037
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/Bannerlord.ButterLib/ExceptionHandler/BEWPatch.cs b/src/Bannerlord.ButterLib/ExceptionHandler/BEWPatch.cs
@@ -65,9 +65,6 @@ private static void Finalizer(Exception? __exception)
     {
         if (__exception is not null)
         {
-            if (ExceptionHandlerSubSystem.Instance?.DisableWhenDebuggerIsAttached == true && IsDebuggerAttached())
-                return;
-
             ExceptionReporter.Show(__exception);
         }
     }

diff --git a/src/Bannerlord.ButterLib/ExceptionHandler/ExceptionHandlerSubSystem.cs b/src/Bannerlord.ButterLib/ExceptionHandler/ExceptionHandlerSubSystem.cs
@@ -78,6 +78,8 @@ public void Enable()
 
         if (!BEWPatch.IsDebuggerAttached())
             SubscribeToUnhandledException();
+        else if (Instance?.DisableWhenDebuggerIsAttached == true)
+            return;
 
         if (!_wasButrLoaderInterceptorCalled)
         {
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,9 +65,6 @@ private static void Finalizer(Exception? __exception) @@
         {
             if (__exception is not null)
             {
-                if (ExceptionHandlerSubSystem.Instance?.DisableWhenDebuggerIsAttached == true && IsDebuggerAttached())
-                    return;
                 ExceptionReporter.Show(__exception);
             }
         }
@@ Expand Down @@