From 36460a06f31ca92371d84d59bd9dd52f0c5a46a0 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Mon, 22 Feb 2010 14:53:23 +0000
Subject: reverted r1563 (Closes issue 254)

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1566 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/qmmpui/mediaplayer.cpp | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'src/qmmpui/mediaplayer.cpp')

diff --git a/src/qmmpui/mediaplayer.cpp b/src/qmmpui/mediaplayer.cpp
index c77fd1a09..35f52e6e0 100644
--- a/src/qmmpui/mediaplayer.cpp
+++ b/src/qmmpui/mediaplayer.cpp
@@ -74,25 +74,17 @@ bool MediaPlayer::isRepeatable() const
 
 void MediaPlayer::play()
 {
-    QString s;
     m_pl_manager->currentPlayList()->doCurrentVisibleRequest();
-    if(m_pl_manager->currentPlayList()->count() > 0)
-        s = m_pl_manager->currentPlayList()->currentItem()->url();
-
     if (m_core->state() == Qmmp::Paused)
     {
-        if(m_core->url() == s)
-        {
-            m_core->pause();
-            return;
-        }
-        else
-        {
-            stop();
-            qApp->processEvents();
-        }
+        m_core->pause();
+        return;
     }
 
+    if (m_pl_manager->currentPlayList()->count() == 0)
+        return;
+
+    QString s = m_pl_manager->currentPlayList()->currentItem()->url();
     if (s.isEmpty())
     {
         m_nextUrl.clear();
-- 
cgit v1.2.3-13-gbd6f