diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/modlistcontextmenu.cpp | 5 | ||||
| -rw-r--r-- | src/modlistviewactions.cpp | 2 |
2 files changed, 1 insertions, 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; |
