Merge pull request #1444 from LostDragonist/lockedorder

Fix load order when using locked plugins

1 files changed, 2 insertions, 2 deletions

diff --git a/src/pluginlist.cpp b/src/pluginlist.cpp
index b6cb25d0..10ed1e28 100644
--- a/src/pluginlist.cpp
+++ b/src/pluginlist.cpp
@@ -543,7 +543,7 @@ void PluginList::readLockedOrderFrom(const QString &fileName)
     auto alreadyLocked = [&](){ return std::find_if(m_LockedOrder.begin(), m_LockedOrder.end(), findLocked) != m_LockedOrder.end(); };

 

     // See if we can just set the given priority

-    if (!m_ESPs[priority].forceEnabled && !alreadyLocked())

+    if (!m_ESPs[m_ESPsByPriority.at(priority)].forceEnabled && !alreadyLocked())

     {

       m_LockedOrder[pluginName] = priority;

       continue;

@@ -552,7 +552,7 @@ void PluginList::readLockedOrderFrom(const QString &fileName)
     // Find the next higher priority we can set the plugin to

     while (++priority < m_ESPs.size())

     {

-      if (!m_ESPs[priority].forceEnabled && !alreadyLocked())

+      if (!m_ESPs[m_ESPsByPriority.at(priority)].forceEnabled && !alreadyLocked())

       {

         m_LockedOrder[pluginName] = priority;

         break;