oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

player/Thread: merge two mutex locks

Browse Source
This commit is contained in:
Max Kellermann
2017-12-22 00:39:54 +01:00
parent d0194a6fb3
commit 5becffbba5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/player/Thread.cxx
View File

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