summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/modlist.cpp3
-rw-r--r--src/profile.cpp20
2 files changed, 15 insertions, 8 deletions
diff --git a/src/modlist.cpp b/src/modlist.cpp
index 1c097db4..ffa841ed 100644
--- a/src/modlist.cpp
+++ b/src/modlist.cpp
@@ -609,8 +609,7 @@ bool ModList::setData(const QModelIndex &index, const QVariant &value, int role)
newPriority = 0;
}
if (ok) {
- m_Profile->setModPriority(modID, newPriority);
- emit modPrioritiesChanged({ index });
+ changeModPriority(modID, newPriority);
result = true;
} else {
result = false;
diff --git a/src/profile.cpp b/src/profile.cpp
index 029265e2..b77a8295 100644
--- a/src/profile.cpp
+++ b/src/profile.cpp
@@ -650,14 +650,22 @@ void Profile::setModPriority(unsigned int index, int &newPriority)
return;
}
- for (std::map<int, unsigned int>::iterator iter = m_ModIndexByPriority.begin(); iter != m_ModIndexByPriority.end(); iter++) {
- if (newPriority < oldPriority && iter->first >= newPriority && iter->first < oldPriority) {
- m_ModStatus.at(iter->second).m_Priority += 1;
+ // we need to put the mod before backups
+ auto it = std::find_if(m_ModIndexByPriority.begin(), m_ModIndexByPriority.end(), [](auto&& p) {
+ return ModInfo::getByIndex(p.second)->isBackup();
+ });
+ if (it != m_ModIndexByPriority.end() && it->first <= newPriority) {
+ newPriority = it->first - 1;
+ }
+
+ for (auto& [priority, index] : m_ModIndexByPriority) {
+ if (newPriority < oldPriority && priority >= newPriority && priority < oldPriority) {
+ m_ModStatus.at(index).m_Priority += 1;
}
- else if (newPriority > oldPriority && iter->first <= newPriority && iter->first > oldPriority) {
- m_ModStatus.at(iter->second).m_Priority -= 1;
+ else if (newPriority > oldPriority && priority <= newPriority && priority > oldPriority) {
+ m_ModStatus.at(index).m_Priority -= 1;
}
- lastPriority = std::max(lastPriority, iter->first);
+ lastPriority = std::max(lastPriority, priority);
}
newPriority = std::min(newPriority, lastPriority);