From 54a79f06652a6ac42fa6fe14d234548e5b127892 Mon Sep 17 00:00:00 2001
From: John Maguire <john.maguire@gmail.com>
Date: Thu, 26 May 2011 15:40:53 +0000
Subject: [PATCH] Always pause on --pause. Fixes issue #1599

---
 src/core/mpris1.cpp |  2 +-
 src/core/player.cpp | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/core/mpris1.cpp b/src/core/mpris1.cpp
index 34af5d89c..3557b7865 100644
--- a/src/core/mpris1.cpp
+++ b/src/core/mpris1.cpp
@@ -142,7 +142,7 @@ void Mpris1Root::Quit() {
 }
 
 void Mpris1Player::Pause() {
-  player_->Pause();
+  player_->PlayPause();
 }
 
 void Mpris1Player::Stop() {
diff --git a/src/core/player.cpp b/src/core/player.cpp
index e44beabe5..0c9679491 100644
--- a/src/core/player.cpp
+++ b/src/core/player.cpp
@@ -381,16 +381,7 @@ void Player::Mute() {
 }
 
 void Player::Pause() {
-  switch (GetState()) {
-    case Engine::Playing:
-      engine_->Pause();
-      break;
-    case Engine::Paused:
-      engine_->Unpause();
-      break;
-    default:
-      return;
-  }
+  engine_->Pause();
 }
 
 void Player::Play() {