From 56d039274776078cfff0565cf66fbb0b4852f90e Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Sat, 16 Jan 2021 15:01:33 +0100
Subject: Only consider loose files vs. loose files conflicts for 'Send to last
 conflict' entry.

---
 src/modlistcontextmenu.cpp | 5 +----
 src/modlistviewactions.cpp | 2 --
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/modlistcontextmenu.cpp b/src/modlistcontextmenu.cpp
index dafffbff..cdadbf8a 100644
--- a/src/modlistcontextmenu.cpp
+++ b/src/modlistcontextmenu.cpp
@@ -244,10 +244,7 @@ void ModListContextMenu::addSendToContextMenu()
   static const std::vector overwritten_flags{
     ModInfo::EConflictFlag::FLAG_CONFLICT_MIXED,
     ModInfo::EConflictFlag::FLAG_CONFLICT_OVERWRITTEN,
-    ModInfo::EConflictFlag::FLAG_CONFLICT_REDUNDANT,
-    ModInfo::EConflictFlag::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITTEN,
-    ModInfo::EConflictFlag::FLAG_ARCHIVE_CONFLICT_OVERWRITTEN,
-    ModInfo::EConflictFlag::FLAG_ARCHIVE_CONFLICT_MIXED
+    ModInfo::EConflictFlag::FLAG_CONFLICT_REDUNDANT
   };
 
   bool overwritten = false;
diff --git a/src/modlistviewactions.cpp b/src/modlistviewactions.cpp
index ded43284..097c2538 100644
--- a/src/modlistviewactions.cpp
+++ b/src/modlistviewactions.cpp
@@ -591,8 +591,6 @@ void ModListViewActions::sendModsToLastConflict(const QModelIndexList& indexes)
     }
     auto info = ModInfo::getByIndex(idx.data(ModList::IndexRole).toInt());
     conflicts.insert(info->getModOverwritten().begin(), info->getModOverwritten().end());
-    conflicts.insert(info->getModArchiveOverwritten().begin(), info->getModArchiveOverwritten().end());
-    conflicts.insert(info->getModArchiveLooseOverwritten().begin(), info->getModArchiveLooseOverwritten().end());
   }
 
   std::set<int> priorities;
-- 
cgit v1.3.1