From f9fef260df8430c6181e26e3f9df87e4f688d68d Mon Sep 17 00:00:00 2001 From: nift4 Date: Sun, 27 Jul 2025 19:41:37 +0200 Subject: [PATCH] Fix crash when setting empty playlist on ExoPlayer with ForwardingSimpleBasePlayer --- .../src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java index 89b62172e81..407bcb347db 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java @@ -2467,7 +2467,7 @@ private void setMediaSourcesInternal( maskWindowPositionMsOrGetPeriodPositionUs(timeline, startWindowIndex, startPositionMs)); // Mask the playback state. int maskingPlaybackState = newPlaybackInfo.playbackState; - if (startWindowIndex != C.INDEX_UNSET && newPlaybackInfo.playbackState != STATE_IDLE) { + if (startWindowIndex != C.INDEX_UNSET || newPlaybackInfo.playbackState != STATE_IDLE) { // Position reset to startWindowIndex (results in pending initial seek). if (timeline.isEmpty() || startWindowIndex >= timeline.getWindowCount()) { // Setting an empty timeline or invalid seek transitions to ended.