From a777649d1451862984a7825ba923e9dbca1c5e24 Mon Sep 17 00:00:00 2001
From: TheXamlGuy <dan_clark@outlook.com>
Date: Wed, 29 May 2024 21:12:01 +0100
Subject: [PATCH] Crunch those numbers

---
 Toolkit.Foundation/ObservableCollection.cs | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/Toolkit.Foundation/ObservableCollection.cs b/Toolkit.Foundation/ObservableCollection.cs
index 0acdd43..4da3784 100644
--- a/Toolkit.Foundation/ObservableCollection.cs
+++ b/Toolkit.Foundation/ObservableCollection.cs
@@ -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;