Reworking the DatabaseReloadWithMM to be "safe"

Author: Lisias

Source/ModuleManager/ModuleManager.cs

@@ -280,63 +280,67 @@ public static bool IsABadIdea()
         }
         */
 
-        internal IEnumerator DataBaseReloadWithMM(bool dump = false)
-        {
-            QualitySettings.vSyncCount = 0;
-            Application.targetFrameRate = -1;
-
-            patchRunner = new MMPatchRunner(ModLogger.Instance);
-
-            bool startedReload = false;
+		internal IEnumerator DataBaseReloadWithMM(bool dump = false)
+		{
+			PerformanceMetrics.Instance.Start();
+			try
+			{
+				patchRunner = new MMPatchRunner(ModLogger.Instance);
 
-            GUI.ReloadingDatabaseDialog reloadingDialog = GUI.ReloadingDatabaseDialog.Show(this, startedReload);
+				bool startedReload = false;
 
-            yield return null;
+				GUI.ReloadingDatabaseDialog reloadingDialog = GUI.ReloadingDatabaseDialog.Show(this, startedReload);
 
-            GameDatabase.Instance.Recompile = true;
-            GameDatabase.Instance.StartLoad();
+				yield return null;
 
-            startedReload = true;
+				GameDatabase.Instance.Recompile = true;
+				GameDatabase.Instance.StartLoad();
 
-            yield return null;
-            StartCoroutine(patchRunner.Run());
+				startedReload = true;
 
-            // wait for it to finish
-            while (!GameDatabase.Instance.IsReady())
-                yield return null;
+				yield return null;
+				StartCoroutine(patchRunner.Run());
 
-            PostPatchLoader.Instance.StartLoad();
+				// wait for it to finish
+				while (!GameDatabase.Instance.IsReady())
+					yield return null;
 
-            while (!PostPatchLoader.Instance.IsReady())
-                yield return null;
+				PostPatchLoader.Instance.StartLoad();
 
-            if (dump)
-                OutputAllConfigs();
+				while (!PostPatchLoader.Instance.IsReady())
+					yield return null;
 
-            PartLoader.Instance.StartLoad();
+				if (dump)
+					OutputAllConfigs();
 
-            while (!PartLoader.Instance.IsReady())
-                yield return null;
+				PartLoader.Instance.StartLoad();
 
-            // Needs more work.
-            //ConfigNode game = HighLogic.CurrentGame.config.GetNode("GAME");
+				while (!PartLoader.Instance.IsReady())
+					yield return null;
 
-            //if (game != null && ResearchAndDevelopment.Instance != null)
-            //{
-            //    ScreenMessages.PostScreenMessage("GAME found");
-            //    ConfigNode scenario = game.GetNodes("SCENARIO").FirstOrDefault((ConfigNode n) => n.name == "ResearchAndDevelopment");
-            //    if (scenario != null)
-            //    {
-            //        ScreenMessages.PostScreenMessage("SCENARIO found");
-            //        ResearchAndDevelopment.Instance.OnLoad(scenario);
-            //    }
-            //}
+				// Needs more work.
+				//ConfigNode game = HighLogic.CurrentGame.config.GetNode("GAME");
 
-            QualitySettings.vSyncCount = GameSettings.SYNC_VBL;
-            Application.targetFrameRate = GameSettings.FRAMERATE_LIMIT;
+				//if (game != null && ResearchAndDevelopment.Instance != null)
+				//{
+				//	ScreenMessages.PostScreenMessage("GAME found");
+				//	ConfigNode scenario = game.GetNodes("SCENARIO").FirstOrDefault((ConfigNode n) => n.name == "ResearchAndDevelopment");
+				//	if (scenario != null)
+				//	{
+				//		ScreenMessages.PostScreenMessage("SCENARIO found");
+				//		ResearchAndDevelopment.Instance.OnLoad(scenario);
+				//	}
+				//}
 
-            reloadingDialog.Dismiss();
-        }
+				reloadingDialog.Dismiss();
+			}
+			finally
+			{
+				PerformanceMetrics.Instance.Stop();
+				Log("Total reloading Time = " + PerformanceMetrics.Instance.ElapsedTimeInSecs.ToString("F3") + "s");
+				PerformanceMetrics.Instance.Destroy();
+			}
+		}
 
         public static void OutputAllConfigs()
         {