aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Pyne <[email protected]>2018-03-05 21:54:34 -0500
committerMichael Pyne <[email protected]>2018-03-05 21:54:34 -0500
commit57457aee76ec28a3ed590ff559da60b353864ad6 (patch)
tree97855384afda8d6501bed298e6252f8584bdf6ef
parent2126484511b46e8fe564da705895dab4db188dd0 (diff)
mpris: Don't toggle playback with "Pause".
We already have a separate playPause action for this, both in the MPRIS2 DBus adaptor, and in PlayerManager. This also fixes playback resuming when the computer is suspended (Plasma sends the "Pause" command to each media player regardless of whether it's playing, and JuK incorrectly treats that as a request to toggle playback). BUG:381271 FIXED-IN:18.04
-rw-r--r--playermanager.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/playermanager.cpp b/playermanager.cpp
index f41d56d..c4ab876 100644
--- a/playermanager.cpp
+++ b/playermanager.cpp
@@ -257,13 +257,8 @@ void PlayerManager::play()
void PlayerManager::pause()
{
- if(!m_setup)
- return;
-
- if(paused()) {
- play();
+ if(!m_setup || paused())
return;
- }
action("pause")->setEnabled(false);