moved repeated code into method

A-tG · May 1, 2022 · 52a79ef · 52a79ef
1 parent a10adba
commit 52a79ef
Showing 1 changed file with 14 additions and 18 deletions.
diff --git a/VoicemeeterOsdProgram/Options/OsdOptions.cs b/VoicemeeterOsdProgram/Options/OsdOptions.cs
@@ -81,15 +81,7 @@ public HashSet<StripElements> AlwaysShowElements
             get => m_alwaysShowElements;
             set
             {
-                if ((value.Count > 1) && value.Contains(StripElements.None))
-                {
-                    value.Remove(StripElements.None);
-                }
-                if (value.Count == 0)
-                {
-                    value.Add(StripElements.None);
-                }
-
+                HandleStripElementsCollection(value);
                 HandlePropertyChange(ref m_alwaysShowElements, ref value, AlwaysShowElementsChanged);
             }
         }
@@ -100,15 +92,7 @@ public HashSet<StripElements> NeverShowElements
             get => m_neverShowElements;
             set
             {
-                if ((value.Count > 1) && value.Contains(StripElements.None))
-                {
-                    value.Remove(StripElements.None);
-                }
-                if (value.Count == 0)
-                {
-                    value.Add(StripElements.None);
-                }
-
+                HandleStripElementsCollection(value);
                 HandlePropertyChange(ref m_neverShowElements, ref value, NeverShowElementsChanged);
             }
         }
@@ -160,6 +144,18 @@ public override bool TryParseTo(string fromPropertyName, out string toVal)
             }
         }
 
+        private void HandleStripElementsCollection(ICollection<StripElements> elements)
+        {
+            if ((elements.Count > 1) && elements.Contains(StripElements.None))
+            {
+                elements.Remove(StripElements.None);
+            }
+            if (elements.Count == 0)
+            {
+                elements.Add(StripElements.None);
+            }
+        }
+
         public event EventHandler<bool> DontShowIfVoicemeeterVisibleChanged;
         public event EventHandler<bool> IsInteractableChanged;
         public event EventHandler<uint> DurationMsChanged;