Merge branch 'v0.20.x'

This commit is contained in:
Max Kellermann
2018-10-29 23:06:32 +01:00
5 changed files with 14 additions and 16 deletions

View File

@@ -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