always emit blacklistedSkillActivated

MycroftAI · Mar 4, 2020 · c8c255c · c8c255c
1 parent 69379a7
commit c8c255c
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/import/activeskillsmodel.cpp b/import/activeskillsmodel.cpp
@@ -95,17 +95,15 @@ void ActiveSkillsModel::setWhiteList(const QStringList &list)
 
 void ActiveSkillsModel::checkGuiActivation(const QString &skillId)
 {
+    if (!skillAllowed(skillId)) {
+        emit blacklistedSkillActivated(skillId);
+        return;
+    }
     if (activeSkills().isEmpty()) {
         return;
     }
 
     if (activeSkills().first() == skillId) {
-        if (skillAllowed(skillId)) {
-            emit skillActivated(skillId);
-        } else {
-            emit blacklistedSkillActivated(skillId);
-        }
-    } else if (data(index(0,0), ActiveSkillsModel::SkillId).toString() == skillId) {
         emit skillActivated(skillId);
     }
 }