Skip to content

fix: skip disabled plugins when enforcing locked load order #2450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Illustar0 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: skip disabled plugins when enforcing locked load order #2450

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0893657
fix: skip disabled plugins when enforcing locked load order
Illustar0 Oct 21, 2026
3e0d324
fix: ignore locks of missing plugins when enforcing locked load order
Illustar0 Oct 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 30 additions & 26 deletions src/pluginlist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -921,39 +921,43 @@ void PluginList::refreshLoadOrder()
{
ChangeBracket<PluginList> layoutChange(this);
syncLoadOrder();
// set priorities according to locked load order
std::map<int, QString> lockedLoadOrder;
std::for_each(m_LockedOrder.begin(), m_LockedOrder.end(),
[&lockedLoadOrder](const std::pair<QString, int>& ele) {
lockedLoadOrder[ele.second] = ele.first;
});
// set priorities according to locked load order, maps load order to plugin index
std::map<int, int> lockedLoadOrder;
for (const auto& [name, loadOrder] : m_LockedOrder) {
// only present, enabled plugins have a load order to enforce; the locks of the
// others are kept and apply again once the plugin is back and enabled
//
// placing a disabled plugin anyway makes it flip around the plugin holding its
// index on every refresh, and leaving any of them in would take the slot of an
// enabled plugin locked to the same index
auto nameIter = m_ESPsByName.find(name);
if (nameIter == m_ESPsByName.end() || !m_ESPs[nameIter->second].enabled) {
continue;
}
lockedLoadOrder[loadOrder] = nameIter->second;
}

int targetPrio = 0;
bool savePluginsList = false;
// this is guaranteed to iterate from lowest key (load order) to highest
for (auto iter = lockedLoadOrder.begin(); iter != lockedLoadOrder.end(); ++iter) {
auto nameIter = m_ESPsByName.find(iter->second);
if (nameIter != m_ESPsByName.end()) {
// locked esp exists

// find the location to insert at
while ((targetPrio < static_cast<int>(m_ESPs.size() - 1)) &&
(m_ESPs[m_ESPsByPriority[targetPrio]].loadOrder < iter->first)) {
++targetPrio;
}
// find the location to insert at
while ((targetPrio < static_cast<int>(m_ESPs.size() - 1)) &&
(m_ESPs[m_ESPsByPriority[targetPrio]].loadOrder < iter->first)) {
++targetPrio;
}

if (static_cast<size_t>(targetPrio) >= m_ESPs.size()) {
continue;
}
if (static_cast<size_t>(targetPrio) >= m_ESPs.size()) {
continue;
}

int temp = targetPrio;
int index = nameIter->second;
if (m_ESPs[index].priority != temp) {
setPluginPriority(index, temp);
m_ESPs[index].loadOrder = iter->first;
syncLoadOrder();
savePluginsList = true;
}
int temp = targetPrio;
int index = iter->second;
if (m_ESPs[index].priority != temp) {
setPluginPriority(index, temp);
m_ESPs[index].loadOrder = iter->first;
syncLoadOrder();
savePluginsList = true;
}
}
if (savePluginsList) {
Expand Down