aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRainer Hochecker <fernetmenta@online.de>2015-11-01 12:26:29 +0100
committerRainer Hochecker <fernetmenta@online.de>2015-11-01 12:28:02 +0100
commit7a5c2b313134861429a06a550d0efcb5e32aa7cc (patch)
tree8650dba36047a134ca6793188ba1ab49703cc779
parent692082a2e1ef5b4ab8e7e667a8d6f3c18c0d22c7 (diff)
paplayer: wait for eof if no crossfading or cue sheet
-rw-r--r--xbmc/cores/paplayer/PAPlayer.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/xbmc/cores/paplayer/PAPlayer.cpp b/xbmc/cores/paplayer/PAPlayer.cpp
index a18e56f26e..29af933ed3 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)