mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-01 20:00:13 +02:00
Code Issues Releases Wiki Activity

Don't crash when listening along if a result in a sourceplaylistinterface's next is not valid

Browse Source
This commit is contained in:
Leo Franchi
2013-01-08 09:36:14 -05:00
parent 852af5737a
commit d66afb9ba3
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libtomahawk/audio/AudioEngine.cpp
View File

@@ -241,7 +241,9 @@ AudioEngine::canGoNext()
return false; 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( shuffleModeChanged( bool ) ), SIGNAL( shuffleModeChanged( bool ) ) );
connect( m_playlist.data(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ), SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ) ); connect( m_playlist.data(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ), SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ) );
emit shuffleModeChanged( m_playlist.data()->shuffled() ); emit shuffleModeChanged( m_playlist.data()->shuffled() );
emit repeatModeChanged( m_playlist.data()->repeatMode() ); emit repeatModeChanged( m_playlist.data()->repeatMode() );
} }