Merge branch 'main' into feature/shuffle

2026-02-15 10:02:44 +01:00
parent 0a3b76b952 497c61e724
commit 3b22a1b261
1 changed files with 3 additions and 1 deletions
@@ -1074,7 +1074,9 @@ func (p *playbackEngine) handleTimePosUpdate(seeked bool) {
 	isNearEnd := meta.Type != mediaprovider.MediaItemTypeRadioStation && s.TimePos > meta.Duration.Seconds()-10
 	if p.needToSetNextTrack && isNearEnd {
 		p.needToSetNextTrack = false
-		p.setNextTrack(p.nextPlayingIndex())
+		if nextIdx := p.nextPlayingIndex(); nextIdx >= 0 && nextIdx < len(p.playQueue) {
+			p.setNextTrack(nextIdx)
+		}
 	}
 	if p.callbacksDisabled {
 		return