Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

playback: fix crash when song cannot be restored

Browse source 
The index is -1, which is not a valid position to seek through
normally. In this case we should just ignore it.
This commit is contained in:
Alexander Capehart 2024-01-21 19:33:49 -07:00
parent 588b6e9abd
commit b53a96f574
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt
View file

@ -774,18 +774,21 @@ class PlaybackStateManagerImpl @Inject constructor() : PlaybackStateManager {
index index
}) })
val oldStateMirror = stateMirror if (index > -1) {
// Valid state where something needs to be played, direct the stateholder to apply
// this new state.
val oldStateMirror = stateMirror
if (oldStateMirror.rawQueue != rawQueue) {
logD("Queue changed, must reload player")
stateHolder?.applySavedState(parent, rawQueue, StateAck.NewPlayback)
stateHolder?.playing(false)
}
if (oldStateMirror.rawQueue != rawQueue) { if (oldStateMirror.progression.calculateElapsedPositionMs() != savedState.positionMs) {
logD("Queue changed, must reload player") logD("Seeking to saved position ${savedState.positionMs}ms")
stateHolder?.applySavedState(parent, rawQueue, StateAck.NewPlayback) stateHolder?.seekTo(savedState.positionMs)
stateHolder?.playing(false) stateHolder?.playing(false)
} }
if (oldStateMirror.progression.calculateElapsedPositionMs() != savedState.positionMs) {
logD("Seeking to saved position ${savedState.positionMs}ms")
stateHolder?.seekTo(savedState.positionMs)
stateHolder?.playing(false)
} }
isInitialized = true isInitialized = true