From 2833f8d61b56a3f4ed6b2a8fafeb679033e6989e Mon Sep 17 00:00:00 2001
From: AL <26797547+Al12rs@users.noreply.github.com>
Date: Fri, 30 Oct 2020 02:15:34 +0100
Subject: Make advanced conflicts tab use italic if current mod file is from
 archive, instead of using the status of the winning version.

---
 src/modinfodialogconflicts.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/modinfodialogconflicts.cpp')

diff --git a/src/modinfodialogconflicts.cpp b/src/modinfodialogconflicts.cpp
index 1a813f7b..751a829e 100644
--- a/src/modinfodialogconflicts.cpp
+++ b/src/modinfodialogconflicts.cpp
@@ -887,6 +887,7 @@ std::optional<ConflictItem> AdvancedConflictsTab::createItem(
   std::wstring before, after;
 
   auto currOrigin = m_tab->origin();
+  bool isCurrOrigArchive = archive;
 
   if (!alternatives.empty()) {
     const bool showAllAlts = ui->conflictsAdvancedShowAll->isChecked();
@@ -927,6 +928,7 @@ std::optional<ConflictItem> AdvancedConflictsTab::createItem(
       });
 
       if (currModIter != alternatives.end()) {
+        isCurrOrigArchive = currModIter->second.first.size() > 0;
         
         if (showAllAlts) {
           // fills 'before' and 'after' with all the alternatives that come
@@ -1010,5 +1012,5 @@ std::optional<ConflictItem> AdvancedConflictsTab::createItem(
 
   return ConflictItem(
     std::move(beforeQS), std::move(relativeName), std::move(afterQS),
-    index, std::move(fileName), hasAlts, QString(), archive);
+    index, std::move(fileName), hasAlts, QString(), isCurrOrigArchive);
 }
-- 
cgit v1.3.1