Fix IsNgrokActive crash when calling Log.Error on non-main thread

NebulaModTeam · Jun 11, 2024 · e68e861 · e68e861
1 parent 5ee3fc8
commit e68e861
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/NebulaModel/Logger/Log.cs b/NebulaModel/Logger/Log.cs
@@ -66,6 +66,15 @@ public static void Error(string message)
         LastErrorMsg = message;
         if (UIFatalErrorTip.instance != null)
         {
+            // Test if current code is executing on the main unity thread
+            if (BepInEx.ThreadingHelper.Instance.InvokeRequired)
+            {
+                // ShowError has Unity API and needs to call on the main thread
+                BepInEx.ThreadingHelper.Instance.StartSyncInvoke(() =>
+                    UIFatalErrorTip.instance.ShowError("[Nebula Error] " + message, "")
+                );
+                return;
+            }
             UIFatalErrorTip.instance.ShowError("[Nebula Error] " + message, "");
         }
     }

diff --git a/NebulaNetwork/Ngrok/NgrokManager.cs b/NebulaNetwork/Ngrok/NgrokManager.cs
@@ -298,9 +298,8 @@ public bool IsNgrokActive()
             _ngrokProcess?.Refresh();
             return !_ngrokProcess?.HasExited ?? false;
         }
-        catch (Exception e)
+        catch
         {
-            Log.Error(e);
             return false;
         }
     }