From a036005f751e7cf299d0e7c0057831bc9e6540e5 Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Sat, 24 Feb 2024 12:37:49 -0700
Subject: [PATCH] playback: fix broken state restore

---
 .../auxio/playback/state/PlaybackStateManager.kt     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt
index 0ebaf669f..b4c13cb24 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt
@@ -418,12 +418,14 @@ class PlaybackStateManagerImpl @Inject constructor() : PlaybackStateManager {
         }
 
         this.stateHolder = stateHolder
-        if (isInitialized && stateMirror.index > -1) {
-            stateHolder.applySavedState(stateMirror.parent, stateMirror.rawQueue, null)
-            stateHolder.seekTo(stateMirror.progression.calculateElapsedPositionMs())
-            stateHolder.playing(false)
-            pendingDeferredPlayback?.let(stateHolder::handleDeferred)
+        if (isInitialized) {
+            if (currentSong != null) {
+                stateHolder.applySavedState(stateMirror.parent, stateMirror.rawQueue, null)
+                stateHolder.seekTo(stateMirror.progression.calculateElapsedPositionMs())
+                stateHolder.playing(false)
+            }
         }
+        pendingDeferredPlayback?.let(stateHolder::handleDeferred)
     }
 
     @Synchronized