skins/skins-qt: Fix handling of "playlist position" event. Closes: #1…

…157.
audacious-media-player · Apr 9, 2022 · fc8622d · fc8622d
1 parent ab71851
commit fc8622d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 24 deletions.
diff --git a/src/skins-qt/playlistwin.cc b/src/skins-qt/playlistwin.cc
@@ -90,7 +90,6 @@ static Button * button_add, * button_sub, * button_sel, * button_misc, * button_
 
 static int resize_base_width, resize_base_height;
 //static int drop_position;
-static bool song_changed;
 
 static void update_info ()
 {
@@ -492,12 +491,6 @@ static void update_cb (void *, void *)
 {
     playlistwin_list->refresh ();
 
-    if (song_changed)
-    {
-        playlistwin_list->set_focused (Playlist::active_playlist ().get_position ());
-        song_changed = false;
-    }
-
     update_info ();
     update_rollup_text ();
 }
@@ -509,10 +502,11 @@ static void follow_cb (void * data, void *)
 
     int row = list.get_position ();
     if (row >= 0)
+    {
         list.select_entry (row, true);
-
-    if (list == Playlist::active_playlist ())
-        song_changed = true;
+        if (list == Playlist::active_playlist ())
+            playlistwin_list->set_focused (row);
+    }
 }
 
 void playlistwin_create ()
@@ -523,8 +517,6 @@ void playlistwin_create ()
     update_info ();
     update_rollup_text ();
 
-    song_changed = false;
-
     hook_associate ("playlist position", follow_cb, nullptr);
     hook_associate ("playlist activate", update_cb, nullptr);
     hook_associate ("playlist update", update_cb, nullptr);

diff --git a/src/skins/playlistwin.cc b/src/skins/playlistwin.cc
@@ -94,7 +94,6 @@ static Button * button_add, * button_sub, * button_sel, * button_misc, * button_
 
 static int resize_base_width, resize_base_height;
 static int drop_position;
-static bool song_changed;
 
 static void update_info ()
 {
@@ -505,12 +504,6 @@ static void update_cb (void *, void *)
 {
     playlistwin_list->refresh ();
 
-    if (song_changed)
-    {
-        playlistwin_list->set_focused (Playlist::active_playlist ().get_position ());
-        song_changed = false;
-    }
-
     update_info ();
     update_rollup_text ();
 }
@@ -522,10 +515,11 @@ static void follow_cb (void * data, void *)
 
     int row = list.get_position ();
     if (row >= 0)
+    {
         list.select_entry (row, true);
-
-    if (list == Playlist::active_playlist ())
-        song_changed = true;
+        if (list == Playlist::active_playlist ())
+            playlistwin_list->set_focused (row);
+    }
 }
 
 void playlistwin_create ()
@@ -536,8 +530,6 @@ void playlistwin_create ()
     update_info ();
     update_rollup_text ();
 
-    song_changed = false;
-
     hook_associate ("playlist position", follow_cb, nullptr);
     hook_associate ("playlist activate", update_cb, nullptr);
     hook_associate ("playlist update", update_cb, nullptr);