From 43bf42df6f2552b55b01304ad794446dd0e57672 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sun, 21 Aug 2011 02:38:14 +0200 Subject: [PATCH] * Fixed TWK-387: Stop showing a loading spinner, if there are no items to load. --- src/libtomahawk/database/databasecommand_allalbums.cpp | 6 ++---- src/libtomahawk/playlist/treemodel.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/libtomahawk/database/databasecommand_allalbums.cpp b/src/libtomahawk/database/databasecommand_allalbums.cpp index f57bde620..cd6784864 100644 --- a/src/libtomahawk/database/databasecommand_allalbums.cpp +++ b/src/libtomahawk/database/databasecommand_allalbums.cpp @@ -74,8 +74,7 @@ DatabaseCommand_AllAlbums::execForArtist( DatabaseImpl* dbi ) al << album; } - if ( al.count() ) - emit albums( al, data() ); + emit albums( al, data() ); emit done(); } @@ -124,8 +123,7 @@ DatabaseCommand_AllAlbums::execForCollection( DatabaseImpl* dbi ) al << album; } - if ( al.count() ) - emit albums( al, data() ); + emit albums( al, data() ); emit done(); } diff --git a/src/libtomahawk/playlist/treemodel.cpp b/src/libtomahawk/playlist/treemodel.cpp index 03c0a36a3..eb1d1c63e 100644 --- a/src/libtomahawk/playlist/treemodel.cpp +++ b/src/libtomahawk/playlist/treemodel.cpp @@ -526,6 +526,8 @@ void TreeModel::onAlbumsAdded( const QList& albums, const QVariant& data ) { qDebug() << Q_FUNC_INFO << albums.count() << data.toInt(); + + emit loadingFinished(); if ( !albums.count() ) return; @@ -568,8 +570,6 @@ TreeModel::onAlbumsAdded( const QList& albums, const QVaria emit endInsertRows(); else emit dataChanged( albumitem->index, albumitem->index.sibling( albumitem->index.row(), columnCount( QModelIndex() ) - 1 ) ); - - emit loadingFinished(); } @@ -577,6 +577,8 @@ void TreeModel::onTracksAdded( const QList& tracks, const QVariant& data ) { qDebug() << Q_FUNC_INFO << tracks.count(); + + emit loadingFinished(); if ( !tracks.count() ) return; @@ -610,8 +612,6 @@ TreeModel::onTracksAdded( const QList& tracks, const QVaria emit endInsertRows(); emit dataChanged( item->index.sibling( 0, 0 ), item->index.sibling( item->index.row(), columnCount( QModelIndex() ) - 1 ) ); - - emit loadingFinished(); }