From 46ffedf530e37726e2fd8092b642597fbdb43e75 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sat, 10 Sep 2011 09:29:17 +0200 Subject: [PATCH] * Set current track's playlist correctly. --- src/libtomahawk/audio/audioengine.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/libtomahawk/audio/audioengine.cpp b/src/libtomahawk/audio/audioengine.cpp index ba4cfc89b..89f8918e1 100644 --- a/src/libtomahawk/audio/audioengine.cpp +++ b/src/libtomahawk/audio/audioengine.cpp @@ -195,7 +195,7 @@ AudioEngine::previous() { tDebug( LOGEXTRA ) << Q_FUNC_INFO; - if( canGoPrevious() ) + if ( canGoPrevious() ) loadPreviousTrack(); } @@ -205,7 +205,7 @@ AudioEngine::next() { tDebug( LOGEXTRA ) << Q_FUNC_INFO; - if( canGoNext() ) + if ( canGoNext() ) loadNextTrack(); } @@ -525,19 +525,21 @@ AudioEngine::loadNextTrack() if ( !m_playlist.isNull() && result.isNull() ) { - tDebug( LOGEXTRA ) << Q_FUNC_INFO << " loading playlist's next item"; + tDebug( LOGEXTRA ) << Q_FUNC_INFO << "Loading playlist's next item"; result = m_playlist.data()->nextItem(); + m_currentTrackPlaylist = m_playlist; } if ( !result.isNull() ) { - tDebug( LOGEXTRA ) << Q_FUNC_INFO << " got next item, loading track"; + tDebug( LOGEXTRA ) << Q_FUNC_INFO << "Got next item, loading track"; loadTrack( result ); } else { if ( !m_playlist.isNull() && m_playlist.data()->retryMode() == Tomahawk::PlaylistInterface::Retry ) m_waitingOnNewTrack = true; + stop(); } }