Fix duplicating toolbar button

severedsolo · Feb 17, 2020 · 96d06e6 · 96d06e6
1 parent 97daea6
commit 96d06e6
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 13 deletions.
diff --git a/.idea/.idea.Bureaucracy/.idea/workspace.xml b/.idea/.idea.Bureaucracy/.idea/workspace.xml
diff --git a/Bureaucracy/UI/UIController.cs b/Bureaucracy/UI/UIController.cs
@@ -179,7 +179,7 @@ private PopupDialog DrawMainUi()
             }
             return PopupDialog.SpawnPopupDialog(new Vector2(0.5f, 0.5f), new Vector2(0.5f, 0.5f),
                 new MultiOptionDialog("BureaucracyMain", "", "Bureaucracy: Budget", UISkinManager.GetSkin("MainMenuSkin"),
-                    GetRect(dialogElements), dialogElements.ToArray()), false, UISkinManager.GetSkin("MainMenuSkin"));
+                    GetRect(dialogElements), dialogElements.ToArray()), false, UISkinManager.GetSkin("MainMenuSkin"), false);
         }
 
         private Rect GetRect(List<DialogGUIBase> dialogElements)
@@ -396,5 +396,11 @@ public PopupDialog KctError()
             dialogElements.Add(new DialogGUIButton("OK", () => { }, true));
             return PopupDialog.SpawnPopupDialog(new Vector2(0.5f, 0.5f), new Vector2(0.5f, 0.5f), new MultiOptionDialog("KCTError", "", "KCT Detected!", UISkinManager.GetSkin("MainMenuSkin"), new Rect(0.5f, 0.5f, 400,100), dialogElements.ToArray()), false, UISkinManager.GetSkin("MainMenuSkin"));
         }
+
+        private void OnDestroy()
+        {
+            GameEvents.onGUIApplicationLauncherReady.Remove(SetupToolbarButton);
+            GameEvents.onGUIApplicationLauncherUnreadifying.Remove(RemoveToolbarButton);
+        }
     }
 }
diff --git a/GameData/Bureaucracy/Bureaucracy.version b/GameData/Bureaucracy/Bureaucracy.version
@@ -10,26 +10,26 @@
     "VERSION" :
     {
         "MAJOR" : 1,
-        "MINOR" : 1,
-        "PATCH" : 5,
+        "MINOR" : 2,
+        "PATCH" : 1,
         "BUILD" : 0
     },
     "KSP_VERSION" :
     {
         "MAJOR" : 1,
-        "MINOR" : 8,
-        "PATCH" : 1
+        "MINOR" : 9,
+        "PATCH" : 0
     },
     "KSP_VERSION_MIN" :
     {
         "MAJOR" : 1,
-        "MINOR" : 8,
+        "MINOR" : 9,
         "PATCH" : 0
     },
     "KSP_VERSION_MAX" :
     {
         "MAJOR" : 1,
-        "MINOR" : 8,
+        "MINOR" : 9,
         "PATCH" : 99
     },
     "INSTALL_LOC":

diff --git a/GameData/Bureaucracy/Changelog.cfg b/GameData/Bureaucracy/Changelog.cfg
@@ -3,6 +3,21 @@ KERBALCHANGELOG
     showChangelog = True
     modName = Bureaucracy
 
+    VERSION
+    {
+        version = 1.2.1
+        change = Fix Magically Duplicating Toolbar Buttons
+    }
+
+    VERSION
+    {
+        version = 1.2
+        change = Recompile against KSP 1.9
+        change = Handle Kerbalism's "drip feed" science system properly (this also requires a change in Kerbalism which should be released shortly)
+        change = Running multiple identical experiments will add them to the same UI element, rather than a line for each
+        change = Fixed an issue where the mod wouldn't function properly if the first game loaded was a Sandbox save
+    }
+
     VERSION
     {
         version = 1.1.5