From ea6d8920583a1c6140f7095681302eae07c89c26 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Sun, 28 Aug 2011 02:16:27 -0400 Subject: [PATCH] Fix regression in audioengine logic when encountering the end of the playlist --- src/libtomahawk/audio/audioengine.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/audio/audioengine.cpp b/src/libtomahawk/audio/audioengine.cpp index d14731106..95cacfc27 100644 --- a/src/libtomahawk/audio/audioengine.cpp +++ b/src/libtomahawk/audio/audioengine.cpp @@ -552,7 +552,7 @@ AudioEngine::playlistNextTrackReady() return; m_waitingOnNewTrack = false; - next(); + loadNextTrack(); } @@ -604,7 +604,14 @@ AudioEngine::onStateChanged( Phonon::State newState, Phonon::State oldState ) { m_expectStop = false; tDebug( LOGEXTRA ) << "Finding next track."; - next(); + if ( canGoNext() ) + loadNextTrack(); + else + { + if ( !m_playlist.isNull() && m_playlist.data()->retryMode() == Tomahawk::PlaylistInterface::Retry ) + m_waitingOnNewTrack = true; + stop(); + } } } }