From 40c82fc1908a8ca53abeeabdc618e81e941c987c Mon Sep 17 00:00:00 2001
From: Al12rs <gabriel.cortesi@outlook.com>
Date: Mon, 10 Sep 2018 05:58:24 -0500
Subject: Fixed mainwindow.cpp so that Qt Creator does not break it anymore. We
 should be able to normally use Creator now without having to worry about
 breaking the build.

Partial fix for conflict information getting messd up after opening infodialog or disabling a mod.
Icons still get messed up but conflict tab remains consistent at first inspection.

Reverted main tab to plugins

Changed version of Archive conflicts branch to 2.2.0 pre-alpha.
---
 src/shared/directoryentry.cpp | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

(limited to 'src/shared/directoryentry.cpp')

diff --git a/src/shared/directoryentry.cpp b/src/shared/directoryentry.cpp
index 477f4dad..602d58c7 100644
--- a/src/shared/directoryentry.cpp
+++ b/src/shared/directoryentry.cpp
@@ -282,12 +282,32 @@ bool FileEntry::removeOrigin(int origin)
       // find alternative with the highest priority
       std::vector<std::pair<int, std::pair<std::wstring, int>>>::iterator currentIter = m_Alternatives.begin();
       for (std::vector<std::pair<int, std::pair<std::wstring, int>>>::iterator iter = m_Alternatives.begin(); iter != m_Alternatives.end(); ++iter) {
-        if ((m_Parent->getOriginByID(iter->first).getPriority() > m_Parent->getOriginByID(currentIter->first).getPriority()) &&
-            (iter->first != origin)) {
-          currentIter = iter;
+        if (iter->first != origin) {
+
+          //Both files are not from archives.
+          if (!iter->second.first.size() && !currentIter->second.first.size()) {
+            if ((m_Parent->getOriginByID(iter->first).getPriority() > m_Parent->getOriginByID(currentIter->first).getPriority())) {
+              currentIter = iter;
+            }
+          }
+          else {
+            //Both files are from archives
+            if (iter->second.first.size() && currentIter->second.first.size()) {
+              if (iter->second.second > currentIter->second.second) {
+                currentIter = iter;
+              }
+            }
+            else {
+              //Only one of the two is an archive, so we change currentIter only if he is the archive one.
+              if (currentIter->second.first.size()) {
+                currentIter = iter;
+              }
+            }
+          }
         }
       }
       int currentID = currentIter->first;
+      m_Archive = currentIter->second;
       m_Alternatives.erase(currentIter);
 
       m_Origin = currentID;
@@ -299,15 +319,16 @@ bool FileEntry::removeOrigin(int origin)
       if (!::GetFileTime(file, nullptr, nullptr, &m_FileTime)) {
         // maybe this file is in a bsa, but there is no easy way to find out which. User should refresh
         // the view to find out
-        m_Archive = std::pair<std::wstring, int>(L"bsa?", -1);
+        //m_Archive = std::pair<std::wstring, int>(L"bsa?", -1);
       } else {
-        m_Archive = std::pair<std::wstring, int>(L"", -1);
+        //m_Archive = std::pair<std::wstring, int>(L"", -1);
       }
 
       ::CloseHandle(file);
 
     } else {
       m_Origin = -1;
+      m_Archive = std::pair<std::wstring, int>(L"", -1);
       return true;
     }
   } else {
-- 
cgit v1.3.1