Refactor selected item restoration logic to simplify index checks

onesounds · onesounds · commit f3ded2190d66 · 2025-04-23T10:52:40.000+09:00
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -726,12 +726,7 @@ private ResultsViewModel SelectedResults
                             _blockQueryExecution = false;
                         }
                         // restore selected item
-                        if (Results.Results.Contains(_lastSelectedResultItem))
-                        {
-                            Results.SelectedItem = _lastSelectedResultItem;
-                            Results.SelectedIndex = Results.Results.IndexOf(_lastSelectedResultItem);
-                        }
-                        else if (_lastSelectedResultIndex >= 0 && _lastSelectedResultIndex < Results.Results.Count)
+                        if (_lastSelectedResultIndex >= 0 && _lastSelectedResultIndex < Results.Results.Count)
                         {
                             Results.SelectedIndex = _lastSelectedResultIndex;
                             Results.SelectedItem = Results.Results[_lastSelectedResultIndex];

Original file line number	Diff line number	Diff line change
`@@ -726,12 +726,7 @@ private ResultsViewModel SelectedResults`
`726`	`726`	`_blockQueryExecution = false;`
`727`	`727`	`}`
`728`	`728`	`// restore selected item`
`729`		`- if (Results.Results.Contains(_lastSelectedResultItem))`
`730`		`- {`
`731`		`- Results.SelectedItem = _lastSelectedResultItem;`
`732`		`- Results.SelectedIndex = Results.Results.IndexOf(_lastSelectedResultItem);`
`733`		`- }`
`734`		`- else if (_lastSelectedResultIndex >= 0 && _lastSelectedResultIndex < Results.Results.Count)`
	`729`	`+ if (_lastSelectedResultIndex >= 0 && _lastSelectedResultIndex < Results.Results.Count)`
`735`	`730`	`{`
`736`	`731`	`Results.SelectedIndex = _lastSelectedResultIndex;`
`737`	`732`	`Results.SelectedItem = Results.Results[_lastSelectedResultIndex];`