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

1 files changed, 6 insertions, 14 deletions

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();