mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-04 05:07:27 +02:00
Code Issues Releases Wiki Activity

* Added comment.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-05-18 12:04:31 +02:00
parent 91205b8fd7
commit cf4baf28c3
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libtomahawk/DropJob.cpp
View File

@@ -855,7 +855,7 @@ DropJob::getArtist( const QString &artist )
QList< query_ptr > QList< query_ptr >
DropJob::getAlbum(const QString &artist, const QString &album) DropJob::getAlbum( const QString& artist, const QString& album )
{ {
artist_ptr artistPtr = Artist::get( artist ); artist_ptr artistPtr = Artist::get( artist );
album_ptr albumPtr = Album::get( artistPtr, album ); album_ptr albumPtr = Album::get( artistPtr, album );
@@ -863,7 +863,8 @@ DropJob::getAlbum(const QString &artist, const QString &album)
if ( albumPtr.isNull() ) if ( albumPtr.isNull() )
return QList< query_ptr >(); return QList< query_ptr >();
if ( albumPtr->playlistInterface()->tracks().isEmpty() ) //FIXME: should check tracksLoaded()
if ( albumPtr->playlistInterface( Mixed )->tracks().isEmpty() )
{ {
// For albums that don't exist until this moment, we are the main shared pointer holding on. // For albums that don't exist until this moment, we are the main shared pointer holding on.
// fetching the tracks is asynchronous, so the resulting signal is queued. when we go out of scope we delete // fetching the tracks is asynchronous, so the resulting signal is queued. when we go out of scope we delete
@@ -871,7 +872,7 @@ DropJob::getAlbum(const QString &artist, const QString &album)
m_albumsToKeep.insert( albumPtr ); m_albumsToKeep.insert( albumPtr );
m_dropJob = new DropJobNotifier( QPixmap( RESPATH "images/album-icon.png" ), Album ); m_dropJob = new DropJobNotifier( QPixmap( RESPATH "images/album-icon.png" ), Album );
connect( albumPtr.data(), SIGNAL( tracksAdded( QList<Tomahawk::query_ptr> ) ), connect( albumPtr.data(), SIGNAL( tracksAdded( QList<Tomahawk::query_ptr>, Tomahawk::ModelMode, Tomahawk::collection_ptr ) ),
SLOT( tracksFromDB( QList<Tomahawk::query_ptr> ) ) ); SLOT( tracksFromDB( QList<Tomahawk::query_ptr> ) ) );
JobStatusView::instance()->model()->addJob( m_dropJob ); JobStatusView::instance()->model()->addJob( m_dropJob );
@@ -879,7 +880,7 @@ DropJob::getAlbum(const QString &artist, const QString &album)
return QList< query_ptr >(); return QList< query_ptr >();
} }
else else
return albumPtr->playlistInterface()->tracks(); return albumPtr->playlistInterface( Mixed )->tracks();
} }