From 385a888c0bc8e5b4d4a6791e46eed3b5963c403a Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jrim@rimpo.org>
Date: Sun, 17 Dec 2017 21:33:04 -0600
Subject: Implement file priority for loose files > archives

---
 src/modlist.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/modlist.cpp')

diff --git a/src/modlist.cpp b/src/modlist.cpp
index d7b5f471..3afa94b5 100644
--- a/src/modlist.cpp
+++ b/src/modlist.cpp
@@ -701,14 +701,13 @@ void ModList::highlightMods(const QItemSelection &selected, const MOShared::Dire
     if (fileEntry.get() != nullptr) {
       QString fileName;
       bool archive = false;
-      std::vector<int> origins;
+      std::vector<std::pair<int, std::wstring>> origins;
       {
-        std::vector<int> alternatives = fileEntry->getAlternatives();
-        origins.push_back(fileEntry->getOrigin(archive));
-        origins.insert(origins.end(), alternatives.begin(), alternatives.end());
+        std::vector<std::pair<int, std::wstring>> alternatives = fileEntry->getAlternatives();
+        origins.insert(origins.end(), std::pair<int, std::wstring>(fileEntry->getOrigin(archive), fileEntry->getArchive()));
       }
-      for (int originId : origins) {
-        MOShared::FilesOrigin &origin = directoryEntry.getOriginByID(originId);
+      for (auto originInfo : origins) {
+        MOShared::FilesOrigin &origin = directoryEntry.getOriginByID(originInfo.first);
         for (unsigned int i = 0; i < ModInfo::getNumMods(); ++i) {
           if (ModInfo::getByIndex(i)->internalName() == QString::fromStdWString(origin.getName())) {
             ModInfo::getByIndex(i)->setPluginSelected(true);
-- 
cgit v1.3.1