plt_init_shuffle_albums cleanup

1 files changed, 3 insertions, 4 deletions

diff --git a/streamer.c b/streamer.c
index 432bc16b..70c97d86 100644
--- a/streamer.c
+++ b/streamer.c
@@ -774,10 +774,6 @@ streamer_move_to_randomsong_real (void) {
         }
     }
 
-    if (pl_get_order () == PLAYBACK_ORDER_SHUFFLE_ALBUMS) {
-        plt_init_shuffle_albums (plt, r);
-    }
-
     streamer_set_nextsong (r, 1);
     return 0;
 }
@@ -1357,6 +1353,9 @@ streamer_set_nextsong_real (int song, int pstate) {
         playpos = 0;
         last_seekpos = -1;
     }
+    if (pl_get_order () == PLAYBACK_ORDER_SHUFFLE_ALBUMS) {
+        plt_init_shuffle_albums (streamer_playlist, song);
+    }
     streamer_unlock ();
 }