Crunch those numbers

2024-05-29 21:12:01 +01:00
parent e98dfd08bd
commit a777649d14
1 changed files with 3 additions and 10 deletions
@@ -509,16 +509,9 @@ public partial class ObservableCollection<TItem> :

        if (item.Equals(SelectedItem))
        {
-            if (index <= Count - 1)
-            {
-                TItem selectedItem = this[index];
-                dispatcher.Invoke(() => SelectedItem = selectedItem);
-            }
-            else if (index - 1 >= 0)
-            {
-                TItem selectedItem = this[index - 1];
-                dispatcher.Invoke(() => SelectedItem = selectedItem);
-            }
+            int newIndex = Math.Min(index, Count - 1);
+            TItem? selectedItem = newIndex >= 0 ? this[newIndex] : default;
+            dispatcher.Invoke(() => SelectedItem = selectedItem);
        }

        return true;