Fix symmetry loops

They ended up being harmless but still
blowfishpro · May 6, 2016 · 3a409a6 · 3a409a6
1 parent 5ac7489
commit 3a409a6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/B9PartSwitch/PartSwitch/ModuleB9PartSwitch.cs b/B9PartSwitch/PartSwitch/ModuleB9PartSwitch.cs
@@ -325,7 +325,7 @@ private void SetupGUI()
 
         private void UpdateFromGUI(BaseField field, object oldFieldValueObj)
         {
-            SetNewSubtype(subtypeIndexControl, false, true);
+            BeginSubtypeChange(subtypeIndexControl);
         }
 
         private void UpdateDragCubesOnAttach()
@@ -334,35 +334,36 @@ private void UpdateDragCubesOnAttach()
             RenderProceduralDragCubes();
         }
 
-        private void SetNewSubtype(int newIndex, bool force, bool fireEvents)
+        private void BeginSubtypeChange(int newIndex)
         {
+            if (newIndex < 0 || newIndex >= subtypes.Count)
+                throw new ArgumentException($"Subtype index must be between 0 and {subtypes.Count}");
+
             // For symmetry
             subtypeIndexControl = newIndex;
 
-            if (newIndex == currentSubtypeIndex && !force)
+            if (newIndex == currentSubtypeIndex)
                 return;
 
-            if (newIndex < 0 || newIndex >= subtypes.Count)
-                throw new ArgumentException($"Subtype index must be between 0 and {subtypes.Count}");
+            SetNewSubtype(newIndex);
 
-            if (newIndex != currentSubtypeIndex)
-            {
-                CurrentSubtype.DeactivateObjects();
-                if (HighLogic.LoadedSceneIsEditor)
-                    CurrentSubtype.DeactivateNodes();
-            }
+            foreach (var counterpart in this.FindSymmetryCounterparts())
+                counterpart.SetNewSubtype(newIndex);
 
-            currentSubtypeIndex = newIndex;
+            FireEvents();
+        }
 
-            UpdateSubtype(true);
+        private void SetNewSubtype(int newIndex)
+        {
+            CurrentSubtype.DeactivateObjects();
+            if (HighLogic.LoadedSceneIsEditor)
+                CurrentSubtype.DeactivateNodes();
 
-            foreach (var counterpart in this.FindSymmetryCounterparts())
-                counterpart.SetNewSubtype(newIndex, force, false);
+            currentSubtypeIndex = newIndex;
 
-            if (fireEvents)
-                FireEvents();
+            UpdateSubtype(true);
         }
-
+        
         private void FireEvents()
         {
             if (HighLogic.LoadedSceneIsEditor)

diff --git a/GameData/B9PartSwitch/Plugins/B9PartSwitch.dll b/GameData/B9PartSwitch/Plugins/B9PartSwitch.dll