diff --git a/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp b/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp index 04e6d9e03..fb6fd18a1 100644 --- a/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp +++ b/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp @@ -298,7 +298,7 @@ DynamicPlaylist::loadRevision( const QString& rev ) } -bool +void DynamicPlaylist::remove( const Tomahawk::dynplaylist_ptr& playlist ) { playlist->aboutToBeDeleted( playlist ); @@ -307,8 +307,6 @@ DynamicPlaylist::remove( const Tomahawk::dynplaylist_ptr& playlist ) DatabaseCommand_DeletePlaylist* cmd = new DatabaseCommand_DeleteDynamicPlaylist( playlist->author(), playlist->guid() ); Database::instance()->enqueue( QSharedPointer(cmd) ); - - return false; } @@ -532,8 +530,9 @@ DynamicPlaylist::checkRevisionQueue() if ( !m_revisionQueue.isEmpty() ) { DynQueueItem item = m_revisionQueue.dequeue(); - if ( item.oldRev != currentrevision() && item.applyToTip ) // this was applied to the then-latest, but the already-running operation changed it so it's out of date now. fix it + if ( item.oldRev != currentrevision() && item.applyToTip ) { + // this was applied to the then-latest, but the already-running operation changed it so it's out of date now. fix it item.oldRev = currentrevision(); } if( item.mode == Static ) diff --git a/src/libtomahawk/playlist/dynamic/DynamicPlaylist.h b/src/libtomahawk/playlist/dynamic/DynamicPlaylist.h index 871533871..6ee85049c 100644 --- a/src/libtomahawk/playlist/dynamic/DynamicPlaylist.h +++ b/src/libtomahawk/playlist/dynamic/DynamicPlaylist.h @@ -87,7 +87,7 @@ public: bool autoLoad = true ); - static bool remove( const dynplaylist_ptr& playlist ); + static void remove( const dynplaylist_ptr& playlist ); virtual void loadRevision( const QString& rev = "" ); // :-( int becuase qjson chokes on my enums