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

Assigning nullptr to next_song may disrupt the player thread and render undefined behavior.

player/Control: use CANCEL to clear next_song in Seek()
b78896d6 · Max Kellermann · e753c924 · b78896d6
Commit b78896d6 authored Oct 27, 2015 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

Control.cxx src/player/Control.cxx +5 -1

No files found.
--- a/src/player/Control.cxx
+++ b/src/player/Control.cxx
@@ -227,7 +227,11 @@ PlayerControl::Seek(DetachedSong *song, SongTime t)
 	Lock();
-	delete next_song;
+	if (next_song != nullptr)
+		SynchronousCommand(PlayerCommand::CANCEL);
+	assert(next_song == nullptr);
 	next_song = song;
 	seek_time = t;
 	SynchronousCommand(PlayerCommand::SEEK);