Further MM/Forum cleanup. Preventing undully Dialog Messages.

Author: Lisias

Source/ModuleManagerWatchDog/GUI/SelectMMForkOptionBox.cs

@@ -20,7 +20,7 @@ namespace WatchDog.ModuleManager.GUI.Dialogs
 {
 	internal static class SelectMMForkOptionBox
 	{
-		private readonly static string AMSG = "{0}\n\n KSP will close once you make a choice, so the fix takes effect.";
+		private readonly static string AMSG = "{0}\n\nKSP will close once you make a choice, so the fix takes effect.";
 		internal static void Show(KSPe.UI.OptionDialogBox.Option[] options)
 		{
 			KSPe.UI.OptionDialogBox.Show(

Source/ModuleManagerWatchDog/InstallChecker.cs

@@ -34,10 +34,10 @@ internal void Execute()
 				if (null == msg)
 					msg = this.CheckModuleManager();
 
-				if (null == msg && SanityLib.IsEnforceable(1, 12))
+				if (null == msg)
 				{ 
 					msg = this.CheckModuleManagerConflict112();
-					if (null != msg)
+					if (null != msg && !Globals.Instance.IsValid)
 					{
 						KSPe.UI.OptionDialogBox.Option[] options = new KSPe.UI.OptionDialogBox.Option[]
 						{
@@ -67,7 +67,8 @@ internal void Execute()
 
 		private void Handle(string msg)
 		{
-			if ( null != msg && Globals.Instance.IsValid)
+			Log.dbg("Handling {0}", msg);
+			if ( ErrorMessage.Conflict.ERR_MSG.Equals(msg) && Globals.Instance.IsValid)
 			{
 				string msg2 = this.AutoFix();
 				if (null != msg2)
@@ -88,6 +89,7 @@ private void Handle(string msg)
 
 		private void HandledAutoFix()
 		{
+			Log.dbg("HandledAutoFix");
 			string msg = this.AutoFix();
 			if (null != msg)
 				GUI.Dialogs.ShowRebootTheGameAlertBox.Show(msg);
@@ -240,6 +242,19 @@ private string ForceMyFork()
 			{
 				Log.error("Unexpected error \"{0}\"caugh by ForceMyFork while handling {1}", e.Message, file.Name);
 			}
+
+			string[] victims = new string[] {"ConfigCache", "ConfigSHA", "Physics", "TechTree" };
+			foreach(string v in victims ) try
+			{
+				string fn = SIO.Path.Combine(GAMEDATA, string.Format("{0}.{1}", ASSEMBLY_NAME, v));
+				if (SIO.File.Exists(fn)) SIO.File.Delete(fn);
+				++deletedFiles;
+			}
+			catch (Exception e)
+			{
+				Log.error("Unexpected error \"{0}\"caugh by ForceMyFork while handling {1}", e.Message, v);
+			}
+
 			Log.detail("Removing Forum's MM was {0}.", 0 == deletedFiles ? "unsucessful" : "sucessful");
 			return 0 != deletedFiles ? ErrorMessage.ERR_MM_FORUMDELETED: null;
 		}