summaryrefslogtreecommitdiffstats
path: root/logic/lists
diff options
context:
space:
mode:
authorSky <git@bunnies.cc>2013-11-03 23:53:31 +0000
committerSky <git@bunnies.cc>2013-11-03 23:53:31 +0000
commitdc3b0fcb2b74aeede37b08216b203cab284f7fce (patch)
treece4c2c3a2786bdbb9752c26d6feaab3735ba9bd6 /logic/lists
parent406d8511bdc7b857a200b29e7d6e2fd81eda0f8e (diff)
parentd6e4fb29713d6ce55b092c0e22412f6121e7f516 (diff)
downloadMultiMC-dc3b0fcb2b74aeede37b08216b203cab284f7fce.tar
MultiMC-dc3b0fcb2b74aeede37b08216b203cab284f7fce.tar.gz
MultiMC-dc3b0fcb2b74aeede37b08216b203cab284f7fce.tar.lz
MultiMC-dc3b0fcb2b74aeede37b08216b203cab284f7fce.tar.xz
MultiMC-dc3b0fcb2b74aeede37b08216b203cab284f7fce.zip
Merge branch 'develop'
Diffstat (limited to 'logic/lists')
-rw-r--r--logic/lists/InstanceList.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/logic/lists/InstanceList.cpp b/logic/lists/InstanceList.cpp
index 08985a19..b42d7b7a 100644
--- a/logic/lists/InstanceList.cpp
+++ b/logic/lists/InstanceList.cpp
@@ -422,7 +422,13 @@ bool InstanceProxyModel::subSortLessThan(const QModelIndex &left,
{
BaseInstance *pdataLeft = static_cast<BaseInstance *>(left.internalPointer());
BaseInstance *pdataRight = static_cast<BaseInstance *>(right.internalPointer());
- // kDebug() << *pdataLeft << *pdataRight;
- return QString::localeAwareCompare(pdataLeft->name(), pdataRight->name()) < 0;
- // return pdataLeft->name() < pdataRight->name();
+ QString sortMode = MMC->settings()->get("InstSortMode").toString();
+ if(sortMode == "LastLaunch")
+ {
+ return pdataLeft->lastLaunch() > pdataRight->lastLaunch();
+ }
+ else
+ {
+ return QString::localeAwareCompare(pdataLeft->name(), pdataRight->name()) < 0;
+ }
}