Fix not working on exiting to main menu

bloodypenguin · Aug 22, 2015 · d4374ef · d4374ef
1 parent 89ebf3c
commit d4374ef
Showing 1 changed file with 24 additions and 10 deletions.
diff --git a/Debugger/Mod.cs b/Debugger/Mod.cs
@@ -13,7 +13,9 @@ public class ModToolsBootstrap
 
         private static GameObject modToolsGameObject;
         private static ModTools modTools;
+        public static bool initialized;
         private static bool bootstrapped;
+        public static bool inMainMenu = true;
 
         public static bool IsModToolsActive()
         {
@@ -38,21 +40,26 @@ public static bool IsModToolsActive()
 
         public static void Bootstrap()
         {
-            if (bootstrapped)
+            if (initialized)
             {
                 return;
             }
             try
             {
-                CODebugBase<LogChannel>.verbose = true;
-                CODebugBase<LogChannel>.EnableChannels(LogChannel.All);
-
-                InitModTools(SimulationManager.UpdateMode.Undefined);
-
-                RedirectionHelper.RedirectCalls(
-                    typeof(LoadingWrapper).GetMethod("OnLevelLoaded", new[] { typeof(SimulationManager.UpdateMode) }),
-                    typeof(IsolatedFailures).GetMethod("OnLevelLoaded", new[] { typeof(SimulationManager.UpdateMode) }));
-                bootstrapped = true;
+                if (!bootstrapped)
+                {
+                    CODebugBase<LogChannel>.verbose = true;
+                    CODebugBase<LogChannel>.EnableChannels(LogChannel.All);
+                    RedirectionHelper.RedirectCalls(
+                        typeof(LoadingWrapper).GetMethod("OnLevelLoaded", new[] { typeof(SimulationManager.UpdateMode) }),
+                        typeof(IsolatedFailures).GetMethod("OnLevelLoaded", new[] { typeof(SimulationManager.UpdateMode) }));
+                    bootstrapped = true;
+                }
+                if (inMainMenu)
+                {
+                    InitModTools(SimulationManager.UpdateMode.Undefined);                    
+                }
+                initialized = true;
             }
             catch (Exception ex)
             {
@@ -94,8 +101,15 @@ public string Description
 
         public override void OnLevelLoaded(LoadMode mode)
         {
+            ModToolsBootstrap.inMainMenu = false;
             ModToolsBootstrap.InitModTools((SimulationManager.UpdateMode)mode);
         }
+
+        public override void OnLevelUnloading()
+        {
+            ModToolsBootstrap.initialized = false;
+            ModToolsBootstrap.inMainMenu = true;
+        }
     }
 
 }