A potential error in System.Guid.NewGuid is now caught instead of bub…

…bling up to the error handler
nike4613 · Feb 5, 2021 · 078ff43 · 078ff43
1 parent 2a9a269
commit 078ff43
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/IPA.Injector/Injector.cs b/IPA.Injector/Injector.cs
@@ -86,7 +86,7 @@ internal static void Main(string[] args)
                 CriticalSection.Configure();
 
                 injector.Debug("Prepping bootstrapper");
-                
+
                 // updates backup
                 InstallBootstrapPatch();
 

diff --git a/IPA.Loader/Logging/StdoutInterceptor.cs b/IPA.Loader/Logging/StdoutInterceptor.cs
@@ -124,12 +124,21 @@ public static void Patch(Harmony harmony)
                 var setFg = foregroundProperty?.GetSetMethod();
                 var getFg = foregroundProperty?.GetGetMethod();
 
-                if (resetColor != null)
-                    harmony.Patch(resetColor, transpiler: new HarmonyMethod(typeof(ConsoleHarmonyPatches), nameof(PatchResetColor)));
-                if (foregroundProperty != null)
+                try
                 {
-                    harmony.Patch(setFg, transpiler: new HarmonyMethod(typeof(ConsoleHarmonyPatches), nameof(PatchSetForegroundColor)));
-                    harmony.Patch(getFg, transpiler: new HarmonyMethod(typeof(ConsoleHarmonyPatches), nameof(PatchGetForegroundColor)));
+                    if (resetColor != null)
+                        harmony.Patch(resetColor, transpiler: new HarmonyMethod(typeof(ConsoleHarmonyPatches), nameof(PatchResetColor)));
+                    if (foregroundProperty != null)
+                    {
+                        harmony.Patch(setFg, transpiler: new HarmonyMethod(typeof(ConsoleHarmonyPatches), nameof(PatchSetForegroundColor)));
+                        harmony.Patch(getFg, transpiler: new HarmonyMethod(typeof(ConsoleHarmonyPatches), nameof(PatchGetForegroundColor)));
+                    }
+                }
+                catch (Exception e)
+                {
+                    // Harmony might be fucked because of wierdness in Guid.NewGuid, don't let that kill us
+                    Logger.log.Error("Error installing harmony patches to intercept Console color properties:");
+                    Logger.log.Error(e);
                 }
             }
 

diff --git a/Refs/UnityEngine.CoreModule.Net4.dll b/Refs/UnityEngine.CoreModule.Net4.dll