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

* Don't assert when creating a fresh playlist.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-09-12 21:06:29 +02:00
parent 4f14ce96cb
commit f32c1f1338
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libtomahawk/database/databasecommand_setplaylistrevision.cpp
View File

@@ -179,7 +179,7 @@ DatabaseCommand_SetPlaylistRevision::exec( DatabaseImpl* lib )
qDebug() << "Currentrevision:" << m_currentRevision << "oldrev:" << m_oldrev; qDebug() << "Currentrevision:" << m_currentRevision << "oldrev:" << m_oldrev;
// if optimistic locking is ok, update current revision to this new one // if optimistic locking is ok, update current revision to this new one
if( m_currentRevision == m_oldrev ) if ( m_currentRevision == m_oldrev )
{ {
qDebug() << "updating current revision, optimistic locking ok"; qDebug() << "updating current revision, optimistic locking ok";
@@ -210,9 +210,9 @@ DatabaseCommand_SetPlaylistRevision::exec( DatabaseImpl* lib )
m_previous_rev_orderedguids = v.toStringList(); m_previous_rev_orderedguids = v.toStringList();
} }
} }
else else if ( !m_oldrev.isEmpty() )
{ {
qDebug() << "Not updating current revision, optimistic locking fail"; tDebug() << "Not updating current revision, optimistic locking fail";
Q_ASSERT( false ); Q_ASSERT( false );
} }
} }

1
src/libtomahawk/database/databasecommand_setplaylistrevision.h
View File

@@ -100,6 +100,7 @@ protected:
QMap<QString, Tomahawk::plentry_ptr> m_addedmap; QMap<QString, Tomahawk::plentry_ptr> m_addedmap;
QString m_currentRevision; QString m_currentRevision;
private: private:
QVariantList m_orderedguids; QVariantList m_orderedguids;
QList<Tomahawk::plentry_ptr> m_addedentries, m_entries; QList<Tomahawk::plentry_ptr> m_addedentries, m_entries;