From 24d2adf363ae7295415a6fbaf654ffb5bbd145e5 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Sun, 14 Dec 2025 04:02:40 +0100
Subject: [PATCH] PlaylistView: Set current index when automatically selecting
 track

Fixes #1825
---
 src/playlist/playlistview.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/playlist/playlistview.cpp b/src/playlist/playlistview.cpp
index 54a08031d..0f90dcf2b 100644
--- a/src/playlist/playlistview.cpp
+++ b/src/playlist/playlistview.cpp
@@ -1445,9 +1445,9 @@ void PlaylistView::SongChanged(const Song &song) {
   song_playing_ = song;
 
   if (select_track_ && playlist_) {
-    clearSelection();
-    QItemSelection selection(playlist_->index(playlist_->current_row(), 0), playlist_->index(playlist_->current_row(), Playlist::ColumnCount - 1));
-    selectionModel()->select(selection, QItemSelectionModel::Select);
+    const QModelIndex current_index = playlist_->filter()->mapFromSource(playlist_->index(playlist_->current_row(), 0));
+    if (!current_index.isValid()) return;
+    selectionModel()->setCurrentIndex(current_index, QItemSelectionModel::ClearAndSelect|QItemSelectionModel::Rows);
   }
 
 }