Harden and simplify logic to avoid weird issues

2026-05-18 13:20:32 +08:00 · 2022-10-25 18:57:15 +09:00
parent 22ea9a8ab4
commit cf3bf41b49
1 changed files with 7 additions and 6 deletions
@@ -118,13 +118,16 @@ namespace osu.Game.Screens.Select.Carousel
                return null;

            int forwardsIndex = lastSelectedIndex;
-            bool hasForwards;
-
            int backwardsIndex = lastSelectedIndex;
-            bool hasBackwards;

-            while ((hasBackwards = backwardsIndex >= 0) | (hasForwards = forwardsIndex < Items.Count))
+            while (true)
            {
+                bool hasBackwards = backwardsIndex >= 0 && backwardsIndex < Items.Count;
+                bool hasForwards = forwardsIndex < Items.Count;
+
+                if (!hasBackwards && !hasForwards)
+                    return null;
+
                if (hasForwards && !Items[forwardsIndex].Filtered.Value)
                    return Items[forwardsIndex];

@@ -134,8 +137,6 @@ namespace osu.Game.Screens.Select.Carousel
                forwardsIndex++;
                backwardsIndex--;
            }
-
-            return null;
        }

        protected virtual void PerformSelection()