mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

Avoid crash in SuperCollection.

Browse Source
This commit is contained in:
Teo Mrnjavac
2013-05-10 10:02:35 +02:00
parent b7abc9d0f0
commit 85236c5c62
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/libtomahawk/playlist/TreeProxyModel.cpp
View File

@@ -27,6 +27,7 @@
#include "database/DatabaseImpl.h" #include "database/DatabaseImpl.h"
#include "collection/AlbumsRequest.h" #include "collection/AlbumsRequest.h"
#include "collection/ArtistsRequest.h" #include "collection/ArtistsRequest.h"
#include "database/DatabaseCommand_AllAlbums.h"
#include "PlayableItem.h" #include "PlayableItem.h"
#include "utils/Logger.h" #include "utils/Logger.h"
@@ -73,7 +74,11 @@ TreeProxyModel::onRowsInserted( const QModelIndex& parent, int /* start */, int
if ( pi->artist().isNull() ) if ( pi->artist().isNull() )
return; return;
Tomahawk::AlbumsRequest* cmd = m_model->collection()->requestAlbums( pi->artist() ); Tomahawk::AlbumsRequest* cmd = 0;
if ( !m_model->collection().isNull() )
cmd = m_model->collection()->requestAlbums( pi->artist() );
else
cmd = new DatabaseCommand_AllAlbums( Tomahawk::collection_ptr(), pi->artist() );
cmd->setFilter( m_filter ); cmd->setFilter( m_filter );
@@ -115,7 +120,11 @@ TreeProxyModel::setFilter( const QString& pattern )
} }
else else
{ {
Tomahawk::ArtistsRequest* cmd = m_model->collection()->requestArtists(); Tomahawk::ArtistsRequest* cmd = 0;
if ( !m_model->collection().isNull() )
cmd = m_model->collection()->requestArtists();
else
cmd = new DatabaseCommand_AllArtists(); //for SuperCollection, TODO: replace with a proper proxy-ArtistsRequest
cmd->setFilter( pattern ); cmd->setFilter( pattern );
m_artistsFilterCmd = cmd; m_artistsFilterCmd = cmd;