From dac5d66d7e2ac48242616b69557e2fdd880e331a Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 1 Nov 2015 12:26:29 +0100 Subject: [PATCH] paplayer: wait for eof if no crossfading or cue sheet --- xbmc/cores/paplayer/PAPlayer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/paplayer/PAPlayer.cpp b/xbmc/cores/paplayer/PAPlayer.cpp index a18e56f26e916..29af933ed395a 100644 --- a/xbmc/cores/paplayer/PAPlayer.cpp +++ b/xbmc/cores/paplayer/PAPlayer.cpp @@ -455,7 +455,8 @@ bool PAPlayer::QueueNextFileEx(const CFileItem &file, bool fadeIn/* = true */, b void PAPlayer::UpdateStreamInfoPlayNextAtFrame(StreamInfo *si, unsigned int crossFadingTime) { - if (si) + // if no crossfading or cue sheet, wait for eof + if (si && (crossFadingTime || si->m_endOffset)) { int64_t streamTotalTime = si->m_decoder.TotalTime(); if (si->m_endOffset)