1 files changed, 8 insertions, 0 deletions
diff --git a/src/player_thread.c b/src/player_thread.c
index 7da412dfa..50e097a24 100644
--- a/src/player_thread.c
+++ b/src/player_thread.c
@@ -441,6 +441,14 @@ static void do_play(void)
 						music_pipe_set_lazy(false);
 						notify_signal(&dc.notify);
 						notify_wait(&pc.notify);
+
+						/* set nextChunk to a
+						   non-negative value
+						   so the next
+						   iteration doesn't
+						   assume crossfading
+						   hasn't begun yet */
+						nextChunk = 0;
 						continue;
 					}
 				}