2 files changed, 8 insertions, 1 deletions

diff --git a/main.c b/main.c
index 228e3ecb..466126df 100644
--- a/main.c
+++ b/main.c
@@ -676,6 +676,13 @@ restore_resume_state (void) {
             streamer_lock (); // need to hold streamer thread to make the resume operation atomic
             streamer_set_current_playlist (plt);
             streamer_set_nextsong (track, paused ? 2 : 3);
+            if (pl_get_order () == PLAYBACK_ORDER_SHUFFLE_ALBUMS) {
+                playlist_t *p = plt_get_for_idx (plt);
+                if (p) {
+                    plt_init_shuffle_albums (p, track);
+                    plt_unref (p);
+                }
+            }
             streamer_set_seek (pos);
             streamer_unlock ();
         }
diff --git a/playlist.c b/playlist.c
index 6078e60f..cbcc1e03 100644
--- a/playlist.c
+++ b/playlist.c
@@ -3812,7 +3812,7 @@ pl_get_playlist (playItem_t *it) {
     return NULL;
 }
 
-// this function must be called user starts track manually in shuffle albums mode
+// this function must be called when the user starts track manually in shuffle albums mode
 // r is an index of current track
 // mark previous songs in the album as played
 void