player/Thread: move CommandFinished() call out of SeekDecoder(SongTime)

Decouple this function from player command execution.

player/Thread: move CommandFinished() call out of SeekDecoder(SongTime)
8838bdc1 · Max Kellermann · d6386bc8 · 8838bdc1
Commit 8838bdc1 authored Dec 27, 2017 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

Thread.cxx src/player/Thread.cxx +3 -2

No files found.
--- a/src/player/Thread.cxx
+++ b/src/player/Thread.cxx
@@ -605,7 +605,6 @@ Player::SeekDecoder(SongTime seek_time) noexcept
 	} catch (...) {
 		/* decoder failure */
 		pc.SetError(PlayerError::DECODER, std::current_exception());
-		pc.CommandFinished();
 		return false;
 	}

@@ -658,8 +657,10 @@ Player::SeekDecoder() noexcept

 		/* send the SEEK command */

-		if (!SeekDecoder(pc.seek_time))
+		if (!SeekDecoder(pc.seek_time)) {
+			pc.CommandFinished();
 			return false;
+		}
 	}

 	pc.CommandFinished();