Properly fix #158

Old fix would sometimes cause the navigation system to stop working
LemonUIbyLemon · May 24, 2024 · 44e6e2e · 44e6e2e
1 parent 581ef4d
commit 44e6e2e
Showing 1 changed file with 16 additions and 26 deletions.
diff --git a/LemonUI/Menus/NativeMenu.cs b/LemonUI/Menus/NativeMenu.cs
@@ -1802,34 +1802,29 @@ public void Previous()
             }
 
             int initialIndex = SelectedIndex;
-            int nextIndex = initialIndex;
+            int nextIndex = SelectedIndex;
+
+            nextIndex -= 1;
 
             while (true)
             {
-                if (nextIndex == initialIndex)
-                {
-                    return;
-                }
-
-                nextIndex -= 1;
-
                 if (nextIndex < 0)
                 {
                     nextIndex = Items.Count - 1;
                 }
 
-                if (Items[nextIndex] is NativeSeparatorItem)
+                if (nextIndex == initialIndex)
                 {
-                    continue;
+                    return;
                 }
 
-                if (nextIndex == SelectedIndex)
+                if (Items[nextIndex] is not NativeSeparatorItem)
                 {
+                    SelectedIndex = nextIndex;
                     return;
                 }
 
-                SelectedIndex = nextIndex;
-                return;
+                nextIndex -= 1;
             }
         }
         /// <summary>
@@ -1844,34 +1839,29 @@ public void Next()
             }
 
             int initialIndex = SelectedIndex;
-            int nextIndex = initialIndex;
+            int nextIndex = SelectedIndex;
+
+            nextIndex += 1;
 
             while (true)
             {
-                if (nextIndex == initialIndex)
-                {
-                    return;
-                }
-
-                nextIndex += 1;
-
                 if (nextIndex >= Items.Count)
                 {
                     nextIndex = 0;
                 }
 
-                if (Items[nextIndex] is NativeSeparatorItem)
+                if (nextIndex == initialIndex)
                 {
-                    continue;
+                    return;
                 }
 
-                if (nextIndex == SelectedIndex)
+                if (Items[nextIndex] is not NativeSeparatorItem)
                 {
+                    SelectedIndex = nextIndex;
                     return;
                 }
 
-                SelectedIndex = nextIndex;
-                return;
+                nextIndex += 1;
             }
         }