From d007dbb477a13b275bd204f164fdb2810e380806 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Fri, 21 Jan 2011 18:34:17 +0100 Subject: [PATCH] * Keep resolving and don't abort if we found an offline match. --- src/libtomahawk/database/databasecommand_resolve.cpp | 4 +--- src/sourcetree/sourcetreeview.cpp | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/libtomahawk/database/databasecommand_resolve.cpp b/src/libtomahawk/database/databasecommand_resolve.cpp index 3434d43eb..20b78dab5 100644 --- a/src/libtomahawk/database/databasecommand_resolve.cpp +++ b/src/libtomahawk/database/databasecommand_resolve.cpp @@ -69,8 +69,6 @@ DatabaseCommand_Resolve::exec( DatabaseImpl* lib ) QList< int > tracks = lib->searchTable( "track", trackname, 10 ); QList< int > albums = lib->searchTable( "album", albumname, 10 ); - //qDebug() << "searchTable calls duration:" << timer.elapsed() << "ms"; - if( artists.length() == 0 || tracks.length() == 0 ) { //qDebug() << "No candidates found in first pass, aborting resolve" << artistname << trackname; @@ -145,7 +143,7 @@ DatabaseCommand_Resolve::exec( DatabaseImpl* lib ) { //qDebug() << "Skipping result for offline sourceid:" << files_query.value( 13 ).toUInt(); // will happen for valid sources which are offline (and thus not in the sourcelist) - return; + continue; } m.insert( "url", QString( "servent://%1\t%2" ).arg( s->userName() ).arg( url_str ) ); diff --git a/src/sourcetree/sourcetreeview.cpp b/src/sourcetree/sourcetreeview.cpp index 04eaadf14..06c766570 100644 --- a/src/sourcetree/sourcetreeview.cpp +++ b/src/sourcetree/sourcetreeview.cpp @@ -104,8 +104,8 @@ SourceTreeView::setupMenus() m_renamePlaylistAction->setEnabled( !readonly ); } - connect( m_renamePlaylistAction, SIGNAL( triggered() ), SLOT( renamePlaylist() ) ); connect( m_loadPlaylistAction, SIGNAL( triggered() ), SLOT( loadPlaylist() ) ); + connect( m_renamePlaylistAction, SIGNAL( triggered() ), SLOT( renamePlaylist() ) ); connect( m_deletePlaylistAction, SIGNAL( triggered() ), SLOT( deletePlaylist() ) ); } @@ -138,7 +138,6 @@ SourceTreeView::onItemActivated( const QModelIndex& index ) qDebug() << "SourceTreeItem toggled:" << item->source()->userName(); PlaylistManager::instance()->show( item->source()->collection() ); -// APP->playlistManager()->show( item->source() ); } } }