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

player/Control: use CANCEL to clear next_song in Seek()

Browse Source 
Assigning nullptr to next_song may disrupt the player thread and
render undefined behavior.
This commit is contained in:
Max Kellermann 2015-10-27 23:09:03 +01:00
parent e753c924ef
commit b78896d64e
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/Control.cxx
View File

@ -227,7 +227,11 @@ PlayerControl::Seek(DetachedSong *song, SongTime t)
Lock(); Lock();
delete next_song; if (next_song != nullptr)
SynchronousCommand(PlayerCommand::CANCEL);
assert(next_song == nullptr);
next_song = song; next_song = song;
seek_time = t; seek_time = t;
SynchronousCommand(PlayerCommand::SEEK); SynchronousCommand(PlayerCommand::SEEK);