aboutsummaryrefslogtreecommitdiffstats
path: root/src/decode.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/decode.c')
-rw-r--r--src/decode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/decode.c b/src/decode.c
index fd65dc5ae..688d78322 100644
--- a/src/decode.c
+++ b/src/decode.c
@@ -493,7 +493,7 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer *
if (pause)
player_sleep();
- else if (cb->begin != end && cb->begin != next) {
+ else if (!outputBufferEmpty(cb) && cb->begin != next) {
unsigned int fadePosition;
if (doCrossFade == 1 && next >= 0 &&
((next > cb->begin &&
@@ -562,7 +562,7 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer *
} else
cb->begin++;
player_wakeup_decoder_nb();
- } else if (cb->begin != end && cb->begin == next) {
+ } else if (!outputBufferEmpty(cb) && cb->begin == next) {
/* at the beginning of a new song */
if (doCrossFade == 1 && nextChunk >= 0) {