Merge pull request #84 from ZiwKerman/v2.0-overhaul

More Bugfixes.
MagicSmokeIndustries · Apr 17, 2016 · 186bec0 · 186bec0
2 parents f4e9f28 + b4b9b23
commit 186bec0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/InfernalRobotics/InfernalRobotics/Command/ServoController.cs b/InfernalRobotics/InfernalRobotics/Command/ServoController.cs
@@ -169,9 +169,10 @@ private void OnPartRemove(GameEvents.HostTargetAction<Part, Part> hostTarget)
             Logger.Log("[ServoController] OnPartRemove finished successfully", Logger.Level.Debug);
         }
 
-        private void RebuildServoGroupsEditor()
+        private void RebuildServoGroupsEditor(ShipConstruct ship = null)
         {
-            ShipConstruct ship = EditorLogic.fetch.ship;
+            if(ship==null)
+                ship = EditorLogic.fetch.ship;
 
             ServoGroups = null;
 
@@ -201,7 +202,7 @@ private void RebuildServoGroupsEditor()
 
         private void OnEditorShipModified(ShipConstruct ship)
         {
-            RebuildServoGroupsEditor();
+            RebuildServoGroupsEditor(ship);
 
             Gui.WindowManager.guiRebuildPending = true; //this should force an UI rebuild on first update
 

diff --git a/InfernalRobotics/InfernalRobotics/Gui/ServoDropHandler.cs b/InfernalRobotics/InfernalRobotics/Gui/ServoDropHandler.cs
@@ -39,9 +39,7 @@ public void OnDrop(PointerEventData eventData)
                     }
 
                     var newGroupIndex = dragHandler.dropZone.parent.GetSiblingIndex();
-
-                    ServoController.Instance.ServoGroups[oldGroupIndex].Servos.Remove(s);
-                    ServoController.Instance.ServoGroups[newGroupIndex].Servos.Insert(insertAt, s);
+                    ServoController.MoveServo(ServoController.Instance.ServoGroups[oldGroupIndex], ServoController.Instance.ServoGroups[newGroupIndex], s);
                     break;
                 }
             }

diff --git a/InfernalRobotics/InfernalRobotics/Gui/UIAssetsLoader.cs b/InfernalRobotics/InfernalRobotics/Gui/UIAssetsLoader.cs
@@ -151,7 +151,8 @@ public IEnumerator LoadBundle(string location)
 
                 }
 
-
+                IRAssetBundle.Unload(false);
+                www.Dispose();
             }
         }
 

diff --git a/InfernalRobotics/InfernalRobotics/Gui/WindowManager.cs b/InfernalRobotics/InfernalRobotics/Gui/WindowManager.cs
@@ -1598,7 +1598,7 @@ public void Update()
             if (!ServoController.APIReady || !UIAssetsLoader.controlWindowPrefabReady)
             {
                 GUIEnabled = false;
-                appLauncherButton.SetFalse();
+                appLauncherButton?.SetFalse();
                 return;
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -151,7 +151,8 @@ public IEnumerator LoadBundle(string location) @@
                     }
+                    IRAssetBundle.Unload(false);
+                    www.Dispose();
                 }
             }
@@ Expand Down @@