diff options
| author | Al12rs <gabriel.cortesi@outlook.com> | 2018-08-02 13:12:31 -0500 |
|---|---|---|
| committer | LostDragonist <lost.dragonist@gmail.com> | 2018-12-12 20:16:39 -0600 |
| commit | b05f56c8084fc95590f8a79b9d8a7faf4e0b1844 (patch) | |
| tree | f10eaeaf3e236e73cba13c708712be05eebae290 /src/modinfowithconflictinfo.cpp | |
| parent | f9f70b224e25c2d5bff017fd08d32521d39d5b08 (diff) | |
Added red archive conflict icon and made the conflicts tab change font for files that come from an archive.
Diffstat (limited to 'src/modinfowithconflictinfo.cpp')
| -rw-r--r-- | src/modinfowithconflictinfo.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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); |