Don't activate pending track until the previous track is actually finished!

[disorder] / server / speaker.c

diff --git a/server/speaker.c b/server/speaker.c
index 12929b61cfda84accd7f83edf78338f7e1306e49..835830441545e0f50738d75248759c3884e29b20 100644 (file)
--- a/server/speaker.c
+++ b/server/speaker.c
@@ -648,7 +648,7 @@ static void mainloop(void) {
       pthread_mutex_unlock(&lock);
     }
     /* Act on the pending SM_PLAY */
-    if(pending_playing) {
+    if(!playing && pending_playing) {
       pthread_mutex_lock(&lock);
       playing = pending_playing;
       pending_playing = 0;