summaryrefslogtreecommitdiff
path: root/src/player
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2017-12-28 08:39:48 +0100
committerMax Kellermann <max@musicpd.org>2017-12-28 08:39:48 +0100
commite31abe6d6b0189fd45b102823382610eb57ed891 (patch)
tree36f66dbceebbbd0233cfcd4123dccf5d383bf563 /src/player
parente1349ccadcb11c997f9a45c7986822b78d056446 (diff)
player/Thread: remove redundant outputs.Cancel() call
The STOP, EXIT and CLOSE_AUDIO commands are not finished here; they are propagated to PlayerControl::RunThread() where the outputs.Cancel() call will be done again.
Diffstat (limited to 'src/player')
-rw-r--r--src/player/Thread.cxx5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/player/Thread.cxx b/src/player/Thread.cxx
index 5ba6b3308..0525a81c5 100644
--- a/src/player/Thread.cxx
+++ b/src/player/Thread.cxx
@@ -989,11 +989,8 @@ Player::Run() noexcept
pc.CommandFinished();
while (true) {
- if (!ProcessCommand()) {
- const ScopeUnlock unlock(pc.mutex);
- pc.outputs.Cancel();
+ if (!ProcessCommand())
break;
- }
if (buffering) {
/* buffering at the start of the song - wait