oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

player_thread: reset pc.next_song only if queued

Browse Source 
When we reset pc.next_song if there is no song queued, this might
cause a race condition: the next song to be played is cleared, while
pc.command was already set.  Clear the "next_song" only if there is a
song queued for the current do_play() invocation.
This commit is contained in:
Max Kellermann 2009-02-10 08:18:01 +01:00
parent 40393ae64f
commit 799d1c9dc2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/player_thread.c
View File

@ -92,7 +92,6 @@ static void player_stop_decoder(void)
{ {
dc_stop(&pc.notify); dc_stop(&pc.notify);
pc.state = PLAYER_STATE_STOP; pc.state = PLAYER_STATE_STOP;
pc.next_song = NULL;
event_pipe_emit(PIPE_EVENT_PLAYLIST); event_pipe_emit(PIPE_EVENT_PLAYLIST);
} }
@ -511,6 +510,11 @@ static void do_play(void)
} }
} }
if (player.queued) {
assert(pc.next_song != NULL);
pc.next_song = NULL;
}
player_stop_decoder(); player_stop_decoder();
} }