queue/PlaylistControl: fix crash after seek failure

This completes the bug fix commit 2065e329; if we clear "queued" then we must clear "queued_song" as well, or another variant of the assertion fails.

queue/PlaylistControl: fix crash after seek failure
cab77e35 · Max Kellermann · e3e90b4b · cab77e35 · cab77e35
Commit cab77e35 authored Jan 05, 2018 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

NEWS NEWS +1 -0

PlaylistControl.cxx src/queue/PlaylistControl.cxx +1 -5

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.20.15 (not yet released)
+* queue: fix crash after seek failure
 * resampler
  - soxr: clear internal state after manual song change
 * state file

--- a/src/queue/PlaylistControl.cxx
+++ b/src/queue/PlaylistControl.cxx
@@ -212,8 +212,6 @@ playlist::SeekSongOrder(PlayerControl &pc, unsigned i, SongTime seek_time)
 {
 	assert(queue.IsValidOrder(i));

-	const DetachedSong *queued_song = GetQueuedSong();
-
 	pc.LockClearError();
 	stop_on_error = true;
 	error_count = 0;
@@ -226,8 +224,6 @@ playlist::SeekSongOrder(PlayerControl &pc, unsigned i, SongTime seek_time)

 		playing = true;
 		current = i;
-
-		queued_song = nullptr;
 	}

 	queued = -1;
@@ -235,7 +231,7 @@ playlist::SeekSongOrder(PlayerControl &pc, unsigned i, SongTime seek_time)
 	try {
 		pc.LockSeek(new DetachedSong(queue.GetOrder(i)), seek_time);
 	} catch (...) {
-		UpdateQueuedSong(pc, queued_song);
+		UpdateQueuedSong(pc, nullptr);
 		throw;
 	}