Merge pull request #3427 from Ginger-Automation/BugFix/POMSearchText3…

…7171 Issue of POM text search in act 37171
Ginger-Automation · Jan 8, 2024 · 00456a6 · 00456a6
2 parents 6b85c97 + 262fc4f
commit 00456a6
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/Ginger/Ginger/UserControlsLib/UCListView/UcListView.xaml.cs b/Ginger/Ginger/UserControlsLib/UCListView/UcListView.xaml.cs
@@ -298,12 +298,15 @@ private void SetListSelectedItemAsSourceCurrentItem()
         {
             this.Dispatcher.Invoke(() =>
             {
-                if (mObjList.CurrentItem != xListView.SelectedItem)
+                if(mObjList.CurrentItem != null && xListView.Items.Count > 0)
                 {
-                    xListView.SelectedItem = mObjList.CurrentItem;
-                    int index = xListView.Items.IndexOf(mObjList.CurrentItem);
-                    xListView.SelectedIndex = index;
-                    ScrollToViewCurrentItem();
+                    if (mObjList.CurrentItem != xListView.SelectedItem)
+                    {
+                        xListView.SelectedItem = mObjList.CurrentItem;
+                        int index = xListView.Items.IndexOf(mObjList.CurrentItem);
+                        xListView.SelectedIndex = index;
+                        ScrollToViewCurrentItem();
+                    }
                 }
             });
         }