diff options
| author | Silarn <jrim@rimpo.org> | 2019-12-19 10:52:45 -0600 |
|---|---|---|
| committer | Silarn <jrim@rimpo.org> | 2019-12-19 10:52:45 -0600 |
| commit | dc6653e1009a8081cd4bae7ba15751b9cc6b5e4b (patch) | |
| tree | 5ac5b40a1954394a1b1179b493a448326b1fedf8 /src | |
| parent | e797640a0092fd5d9a887e62138641eac1f7ba01 (diff) | |
Fix conflict filter
Diffstat (limited to 'src')
| -rw-r--r-- | src/modlistsortproxy.cpp | 6 | ||||
| -rw-r--r-- | src/modlistsortproxy.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/modlistsortproxy.cpp b/src/modlistsortproxy.cpp index 440786c5..162b0653 100644 --- a/src/modlistsortproxy.cpp +++ b/src/modlistsortproxy.cpp @@ -269,9 +269,9 @@ void ModListSortProxy::updateFilter(const QString& filter) invalidate();
}
-bool ModListSortProxy::hasConflictFlag(const std::vector<ModInfo::EFlag> &flags) const
+bool ModListSortProxy::hasConflictFlag(const std::vector<ModInfo::EConflictFlag> &flags) const
{
- for (ModInfo::EFlag flag : flags) {
+ for (ModInfo::EConflictFlag flag : flags) {
if ((flag == ModInfo::FLAG_CONFLICT_MIXED) ||
(flag == ModInfo::FLAG_CONFLICT_OVERWRITE) ||
(flag == ModInfo::FLAG_CONFLICT_OVERWRITTEN) ||
@@ -382,7 +382,7 @@ bool ModListSortProxy::categoryMatchesMod( case CategoryFactory::Conflict:
{
- b = (hasConflictFlag(info->getFlags()));
+ b = (hasConflictFlag(info->getConflictFlags()));
break;
}
diff --git a/src/modlistsortproxy.h b/src/modlistsortproxy.h index d733b783..3a29b7f7 100644 --- a/src/modlistsortproxy.h +++ b/src/modlistsortproxy.h @@ -143,7 +143,7 @@ private: unsigned long flagsId(const std::vector<ModInfo::EFlag> &flags) const;
unsigned long conflictFlagsId(const std::vector<ModInfo::EConflictFlag>& flags) const;
- bool hasConflictFlag(const std::vector<ModInfo::EFlag> &flags) const;
+ bool hasConflictFlag(const std::vector<ModInfo::EConflictFlag> &flags) const;
void updateFilterActive();
bool filterMatchesModAnd(ModInfo::Ptr info, bool enabled) const;
bool filterMatchesModOr(ModInfo::Ptr info, bool enabled) const;
|