From dc6653e1009a8081cd4bae7ba15751b9cc6b5e4b Mon Sep 17 00:00:00 2001 From: Silarn Date: Thu, 19 Dec 2019 10:52:45 -0600 Subject: Fix conflict filter --- src/modlistsortproxy.cpp | 6 +++--- src/modlistsortproxy.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') 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 &flags) const +bool ModListSortProxy::hasConflictFlag(const std::vector &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 &flags) const; unsigned long conflictFlagsId(const std::vector& flags) const; - bool hasConflictFlag(const std::vector &flags) const; + bool hasConflictFlag(const std::vector &flags) const; void updateFilterActive(); bool filterMatchesModAnd(ModInfo::Ptr info, bool enabled) const; bool filterMatchesModOr(ModInfo::Ptr info, bool enabled) const; -- cgit v1.3.1