player/Thread: merge two mutex locks

5becffbb · Max Kellermann · d0194a6f · 5becffbb
Commit 5becffbb authored Dec 22, 2017 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

No files found.
--- a/src/player/Thread.cxx
+++ b/src/player/Thread.cxx
@@ -625,14 +625,14 @@ Player::SeekDecoder() noexcept
 				where = total_time;
 		}
+		const std::lock_guard<Mutex> lock(pc.mutex);
 		try {
 			const PlayerControl::ScopeOccupied occupied(pc);
-			const std::lock_guard<Mutex> lock(pc.mutex);
 			dc.Seek(where + start_time);
 		} catch (...) {
 			/* decoder failure */
-			const std::lock_guard<Mutex> lock(pc.mutex);
 			pc.SetError(PlayerError::DECODER,
 				    std::current_exception());
 			pc.CommandFinished();