Fix wrong songs being selected in the list when re-entering BSS after…

… sorting changed
kinsi55 · Aug 5, 2021 · 8677cfc · 8677cfc
1 parent c959774
commit 8677cfc
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/UI/SongListController.cs b/UI/SongListController.cs
@@ -66,14 +66,16 @@ public void _UpdateSearchedSongsList() {
 
 				if(selectedSongView.selectedSong == null) {
 					selectedSongView.SetSelectedSong(searchedSongsList.FirstOrDefault(), true);
-				} else if(wasEmpty) {
-					//selectedSongView.SetSelectedSong(searchedSongsList.FirstOrDefault(x => x.detailsSong.mapId == selectedSongView.selectedSong.detailsSong.mapId), true);
-					songList.ScrollToCellWithIdx(BSSFlowCoordinator.lastVisibleTableRowIdx, TableView.ScrollPositionType.Beginning, false);
 				} else {
-					// Required as otherwise the first cell could be selected eventho its not
+					if(wasEmpty) {
+						//selectedSongView.SetSelectedSong(searchedSongsList.FirstOrDefault(x => x.detailsSong.mapId == selectedSongView.selectedSong.detailsSong.mapId), true);
+						songList.ScrollToCellWithIdx(BSSFlowCoordinator.lastVisibleTableRowIdx, TableView.ScrollPositionType.Beginning, false);
+					}
+					// Always un-select in the list to prevent wrong-selections on resorting, etc.
 					songList.ClearSelection();
 				}
 
+
 				searchInProgress.gameObject.SetActive(false);
 			});
 		}