From b05f56c8084fc95590f8a79b9d8a7faf4e0b1844 Mon Sep 17 00:00:00 2001
From: Al12rs <gabriel.cortesi@outlook.com>
Date: Thu, 2 Aug 2018 13:12:31 -0500
Subject: Added red archive conflict icon and made the conflicts tab change
 font for files that come from an archive.

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

(limited to 'src/modinfowithconflictinfo.cpp')

diff --git a/src/modinfowithconflictinfo.cpp b/src/modinfowithconflictinfo.cpp
index 68b5b265..79896cc3 100644
--- a/src/modinfowithconflictinfo.cpp
+++ b/src/modinfowithconflictinfo.cpp
@@ -34,7 +34,8 @@ std::vector<ModInfo::EFlag> ModInfoWithConflictInfo::getFlags() const
   }
   switch (isLooseArchiveConflicted()) {
     case CONFLICT_MIXED: {
-      result.push_back(ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_MIXED);
+      result.push_back(ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITE);
+	  result.push_back(ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITTEN);
     } break;
     case CONFLICT_OVERWRITE: {
       result.push_back(ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITE);
-- 
cgit v1.3.1