From dc6653e1009a8081cd4bae7ba15751b9cc6b5e4b Mon Sep 17 00:00:00 2001
From: Silarn <jrim@rimpo.org>
Date: Thu, 19 Dec 2019 10:52:45 -0600
Subject: Fix conflict filter

---
 src/modlistsortproxy.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/modlistsortproxy.cpp')

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;
     }
 
-- 
cgit v1.3.1