diff options
| author | Mikaël Capelle <capelle.mikael@gmail.com> | 2021-01-16 15:01:33 +0100 |
|---|---|---|
| committer | Mikaël Capelle <capelle.mikael@gmail.com> | 2021-01-16 15:01:33 +0100 |
| commit | 56d039274776078cfff0565cf66fbb0b4852f90e (patch) | |
| tree | 334b134ea7543ee8d3149a5e8b7daac9cf19a269 /src/modlistcontextmenu.cpp | |
| parent | a2ed9b9ba924672093f6f620cb59a54920b89c57 (diff) | |
Only consider loose files vs. loose files conflicts for 'Send to last conflict' entry.
Diffstat (limited to 'src/modlistcontextmenu.cpp')
| -rw-r--r-- | src/modlistcontextmenu.cpp | 5 |
1 files changed, 1 insertions, 4 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; |