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

player_thread: on return, reset next_song only if queued

Browse Source 
If no song was queued, then player_control.next_song might contain the
value for the next QUEUE command.  We must not reset that.
This commit is contained in:
Max Kellermann 2009-11-03 23:32:37 +01:00
parent 507606bb78
commit a22c93b659
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/player_thread.c
View File

@ -889,14 +889,18 @@ static void do_play(struct decoder_control *dc)
player_dc_stop(&player); player_dc_stop(&player);
assert(!player.queued || pc.next_song != NULL);
pc.next_song = NULL;
music_pipe_clear(player.pipe, player_buffer); music_pipe_clear(player.pipe, player_buffer);
music_pipe_free(player.pipe); music_pipe_free(player.pipe);
player_lock(); player_lock();
if (player.queued) {
assert(pc.next_song != NULL);
pc.next_song = NULL;
}
pc.state = PLAYER_STATE_STOP; pc.state = PLAYER_STATE_STOP;
player_unlock(); player_unlock();
event_pipe_emit(PIPE_EVENT_PLAYLIST); event_pipe_emit(PIPE_EVENT_PLAYLIST);