From 38b0519b1a3c21d1719030d4ab976b82cce6ee2c Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Sun, 27 Feb 2011 16:05:23 +0100
Subject: [PATCH] * Fixed resetting the active playlist.

---
 src/libtomahawk/audio/audioengine.h          | 3 ++-
 src/libtomahawk/playlist/playlistmanager.cpp | 2 +-
 src/libtomahawk/playlist/playlistmanager.h   | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libtomahawk/audio/audioengine.h b/src/libtomahawk/audio/audioengine.h
index a94a5359b..b83eb9bf1 100644
--- a/src/libtomahawk/audio/audioengine.h
+++ b/src/libtomahawk/audio/audioengine.h
@@ -32,7 +32,8 @@ public:
 
     unsigned int volume() const { if ( m_audio ) return m_audio->volume() * 100.0; else return 0; }; // in percent
     bool isPaused() const { return m_audio->isPaused(); }
-
+    bool isPlaying() const { return m_audio->isPlaying(); }
+    
     /* Returns the PlaylistInterface of the currently playing track. Note: This might be different to the current playlist! */
     PlaylistInterface* currentTrackPlaylist() const { return m_currentTrackPlaylist; }
 
diff --git a/src/libtomahawk/playlist/playlistmanager.cpp b/src/libtomahawk/playlist/playlistmanager.cpp
index d36e97edc..b8062fb86 100644
--- a/src/libtomahawk/playlist/playlistmanager.cpp
+++ b/src/libtomahawk/playlist/playlistmanager.cpp
@@ -525,7 +525,7 @@ PlaylistManager::setPage( ViewPage* page, bool trackHistory )
     if ( !currentPlaylistInterface() )
         emit tempPageActivated();
 
-    if ( !AudioEngine::instance()->playlist() )
+    if ( !AudioEngine::instance()->isPlaying() )
         AudioEngine::instance()->setPlaylist( currentPlaylistInterface() );
 
     m_stack->setCurrentWidget( page->widget() );
diff --git a/src/libtomahawk/playlist/playlistmanager.h b/src/libtomahawk/playlist/playlistmanager.h
index a1729a5d1..4cab2f398 100644
--- a/src/libtomahawk/playlist/playlistmanager.h
+++ b/src/libtomahawk/playlist/playlistmanager.h
@@ -103,8 +103,6 @@ public slots:
     void showQueue();
     void hideQueue();
 
-    void setFilter( const QString& filter );
-
     void setRepeatMode( PlaylistInterface::RepeatMode mode );
     void setShuffled( bool enabled );
     
@@ -117,6 +115,7 @@ public slots:
     void onPauseClicked();
     
 private slots:
+    void setFilter( const QString& filter );
     void applyFilter();
     void onWidgetDestroyed( QWidget* widget );