From d66afb9ba37636749d8b1ba5b274cd5b3694b272 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Tue, 8 Jan 2013 09:36:14 -0500 Subject: [PATCH] Don't crash when listening along if a result in a sourceplaylistinterface's next is not valid --- src/libtomahawk/audio/AudioEngine.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/audio/AudioEngine.cpp b/src/libtomahawk/audio/AudioEngine.cpp index f4453d5f6..a3e1177fc 100644 --- a/src/libtomahawk/audio/AudioEngine.cpp +++ b/src/libtomahawk/audio/AudioEngine.cpp @@ -241,7 +241,9 @@ AudioEngine::canGoNext() return false; } - return ( m_currentTrack && m_playlist.data()->hasNextResult() && m_playlist.data()->nextResult()->isOnline() ); + return ( m_currentTrack && m_playlist.data()->hasNextResult() && + !m_playlist.data()->nextResult().isNull() && + m_playlist.data()->nextResult()->isOnline() ); } @@ -903,7 +905,7 @@ AudioEngine::setPlaylist( Tomahawk::playlistinterface_ptr playlist ) connect( m_playlist.data(), SIGNAL( shuffleModeChanged( bool ) ), SIGNAL( shuffleModeChanged( bool ) ) ); connect( m_playlist.data(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ), SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ) ); - + emit shuffleModeChanged( m_playlist.data()->shuffled() ); emit repeatModeChanged( m_playlist.data()->repeatMode() ); }