From 5dcfca7c9d83679b8e863e296687a6943a57a643 Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Mon, 15 Jun 2015 20:01:28 +0200
Subject: bugfix: disabled mods were marked "redundant"

---
 src/modinfo.cpp | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'src/modinfo.cpp')

diff --git a/src/modinfo.cpp b/src/modinfo.cpp
index 69d51688..feb3a96c 100644
--- a/src/modinfo.cpp
+++ b/src/modinfo.cpp
@@ -463,20 +463,21 @@ void ModInfoWithConflictInfo::doConflictCheck() const
         }
       }
     }
+    m_LastConflictCheck = QTime::currentTime();
+
+    if (!providesAnything)
+      m_CurrentConflictState = CONFLICT_REDUNDANT;
+    else if (!m_OverwriteList.empty() && !m_OverwrittenList.empty())
+      m_CurrentConflictState = CONFLICT_MIXED;
+    else if (!m_OverwriteList.empty())
+      m_CurrentConflictState = CONFLICT_OVERWRITE;
+    else if (!m_OverwrittenList.empty()) {
+      m_CurrentConflictState = CONFLICT_OVERWRITTEN;
+    }
+    else m_CurrentConflictState = CONFLICT_NONE;
+  } else {
+    m_CurrentConflictState = CONFLICT_NONE;
   }
-
-  m_LastConflictCheck = QTime::currentTime();
-
-  if (!providesAnything)
-    m_CurrentConflictState = CONFLICT_REDUNDANT;
-  else if (!m_OverwriteList.empty() && !m_OverwrittenList.empty())
-    m_CurrentConflictState = CONFLICT_MIXED;
-  else if (!m_OverwriteList.empty())
-    m_CurrentConflictState = CONFLICT_OVERWRITE;
-  else if (!m_OverwrittenList.empty()) {
-    m_CurrentConflictState = CONFLICT_OVERWRITTEN;
-  }
-  else m_CurrentConflictState = CONFLICT_NONE;
 }
 
 ModInfoWithConflictInfo::EConflictType ModInfoWithConflictInfo::isConflicted() const
-- 
cgit v1.3.1