mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 19:30:21 +02:00
Code Issues Releases Wiki Activity

Minor cleanups

Browse Source
This commit is contained in:
Leo Franchi
2011-09-15 11:13:40 -04:00
parent b6cc9dae09
commit b8aa4e1bc3
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp
View File

@@ -298,7 +298,7 @@ DynamicPlaylist::loadRevision( const QString& rev )
} }
bool void
DynamicPlaylist::remove( const Tomahawk::dynplaylist_ptr& playlist ) DynamicPlaylist::remove( const Tomahawk::dynplaylist_ptr& playlist )
{ {
playlist->aboutToBeDeleted( 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() ); DatabaseCommand_DeletePlaylist* cmd = new DatabaseCommand_DeleteDynamicPlaylist( playlist->author(), playlist->guid() );
Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) ); Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
return false;
} }
@@ -532,8 +530,9 @@ DynamicPlaylist::checkRevisionQueue()
if ( !m_revisionQueue.isEmpty() ) if ( !m_revisionQueue.isEmpty() )
{ {
DynQueueItem item = m_revisionQueue.dequeue(); 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(); item.oldRev = currentrevision();
} }
if( item.mode == Static ) if( item.mode == Static )

2
src/libtomahawk/playlist/dynamic/DynamicPlaylist.h
View File

@@ -87,7 +87,7 @@ public:
bool autoLoad = true bool autoLoad = true
); );
static bool remove( const dynplaylist_ptr& playlist ); static void remove( const dynplaylist_ptr& playlist );
virtual void loadRevision( const QString& rev = "" ); virtual void loadRevision( const QString& rev = "" );
// :-( int becuase qjson chokes on my enums // :-( int becuase qjson chokes on my enums