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

Add and reload tracks to Inbox in the same order.

Browse Source
This commit is contained in:
Teo Mrnjavac
2013-04-14 22:08:47 +02:00
parent 6d874c8da8
commit a0d150489a
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libtomahawk/playlist/InboxModel.cpp
View File

@@ -78,7 +78,6 @@ InboxModel::insertEntries( const QList< Tomahawk::plentry_ptr >& entries, int ro
it != entries.constEnd(); ++it ) it != entries.constEnd(); ++it )
{ {
Tomahawk::plentry_ptr entry = *it; Tomahawk::plentry_ptr entry = *it;
bool gotDupe = false;
for ( QList< Tomahawk::plentry_ptr >::iterator jt = toInsert.begin(); for ( QList< Tomahawk::plentry_ptr >::iterator jt = toInsert.begin();
jt != toInsert.end(); ++jt ) jt != toInsert.end(); ++jt )
{ {
@@ -86,14 +85,13 @@ InboxModel::insertEntries( const QList< Tomahawk::plentry_ptr >& entries, int ro
if ( entry->query()->equals( existingEntry->query(), true /*ignoreCase*/) ) if ( entry->query()->equals( existingEntry->query(), true /*ignoreCase*/) )
{ {
//We got a dupe, let's merge the social actions //We got a dupe, let's merge the social actions
existingEntry->query()->setAllSocialActions( mergeSocialActions( existingEntry->query()->allSocialActions(), entry->query()->setAllSocialActions( mergeSocialActions( existingEntry->query()->allSocialActions(),
entry->query()->allSocialActions() ) ); entry->query()->allSocialActions() ) );
gotDupe = true; toInsert.erase( jt );
break; break;
} }
} }
if ( !gotDupe ) toInsert.append( entry );
toInsert.append( entry );
} }
foreach ( Tomahawk::plentry_ptr plEntry, playlistEntries() ) foreach ( Tomahawk::plentry_ptr plEntry, playlistEntries() )