Merge branch 'release/21.08'

This commit is contained in:
Elvis Angelaccio 2021-07-13 21:50:41 +02:00
commit b26b1d491e

View file

@ -1798,17 +1798,25 @@ int KFileItemModel::sortRoleCompare(const ItemData* a, const ItemData* b, const
auto valueB = b->values.value("count"); auto valueB = b->values.value("count");
if (valueA.isNull()) { if (valueA.isNull()) {
if (valueB.isNull()) { if (valueB.isNull()) {
return 0; result = 0;
break;
} else { } else {
return -1; result = -1;
break;
} }
} else if (valueB.isNull()) { } else if (valueB.isNull()) {
return +1; result = +1;
break;
} else { } else {
if (valueA.toLongLong() < valueB.toLongLong()) { if (valueA.toLongLong() < valueB.toLongLong()) {
return -1; result = -1;
break;
} else if (valueA.toLongLong() > valueB.toLongLong()) {
result = +1;
break;
} else { } else {
return +1; result = 0;
break;
} }
} }
} }