1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-04 05:07:27 +02:00

* Fixed stable sorting issues.

This commit is contained in:
Christian Muehlhaeuser
2013-07-24 03:47:01 +02:00
parent ce96e084f2
commit cd20fbbab7

View File

@@ -319,7 +319,7 @@ PlayableProxyModel::lessThan( int column, const Tomahawk::query_ptr& q1, const T
QString origin2; QString origin2;
qint64 id1 = 0, id2 = 0; qint64 id1 = 0, id2 = 0;
if ( q1->numResults() ) if ( !q1->results().isEmpty() )
{ {
Tomahawk::result_ptr r = q1->results().first(); Tomahawk::result_ptr r = q1->results().first();
bitrate1 = r->bitrate(); bitrate1 = r->bitrate();
@@ -327,11 +327,10 @@ PlayableProxyModel::lessThan( int column, const Tomahawk::query_ptr& q1, const T
mtime1 = r->modificationTime(); mtime1 = r->modificationTime();
size1 = r->size(); size1 = r->size();
year1 = r->track()->year(); year1 = r->track()->year();
score1 = r->isOnline() ? r->score() : 0.0; score1 = r->score();
origin1 = r->friendlySource().toLower(); origin1 = r->friendlySource().toLower();
id1 = (qint64)&r;
} }
if ( q2->numResults() ) if ( !q2->results().isEmpty() )
{ {
Tomahawk::result_ptr r = q2->results().first(); Tomahawk::result_ptr r = q2->results().first();
bitrate2 = r->bitrate(); bitrate2 = r->bitrate();
@@ -339,9 +338,8 @@ PlayableProxyModel::lessThan( int column, const Tomahawk::query_ptr& q1, const T
mtime2 = r->modificationTime(); mtime2 = r->modificationTime();
size2 = r->size(); size2 = r->size();
year2 = r->track()->year(); year2 = r->track()->year();
score2 = r->isOnline() ? r->score() : 0.0; score2 = r->score();
origin2 = r->friendlySource().toLower(); origin2 = r->friendlySource().toLower();
id2 = (qint64)&r;
} }
// This makes it a stable sorter and prevents items from randomly jumping about. // This makes it a stable sorter and prevents items from randomly jumping about.