Merge branch 'v0.20.x'

src/player/Control.cxx

@@ -291,12 +291,8 @@ PlayerControl::LockSeek(std::unique_ptr<DetachedSong> song, SongTime t)
 
 	assert(song != nullptr);
 
-	{
-		const std::lock_guard<Mutex> protect(mutex);
-		SeekLocked(std::move(song), t);
-	}
-
-	idle_add(IDLE_PLAYER);
+	const std::lock_guard<Mutex> protect(mutex);
+	SeekLocked(std::move(song), t);
 }
 
 void

src/player/Thread.cxx

@@ -606,6 +606,8 @@ Player::SeekDecoder() noexcept
 		pc.outputs.Cancel();
 	}
 
+	idle_add(IDLE_PLAYER);
+
 	if (!dc.IsSeekableCurrentSong(*pc.next_song)) {
 		/* the decoder is already decoding the "next" song -
 		   stop it and start the previous song again */