removeAll was in the wrong spot doing the wrong thing

moshmage · May 26, 2016 · 6429503 · 6429503
1 parent 9e5c138
commit 6429503
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/eventer.js b/eventer.js
@@ -102,6 +102,11 @@ Eventer = module.exports = function Eventer(IrcLib, IrcConf) {
             return;
         }
 
+        if (removeAll) {
+            self.EVENTSNET[eventType] = [];
+            return;
+        }
+
         self.EVENTSNET[eventType].some(function(object, index){
             if (object.wordMatch === wordMatch) {
                 found = index;
@@ -113,7 +118,7 @@ Eventer = module.exports = function Eventer(IrcLib, IrcConf) {
             self.EVENTSNET[eventType].splice(found,1);
         }
 
-        if (self.FORCEKEEP.indexOf(eventType) < 0 && self.EVENTSNET[eventType].length === 0 || removeAll) {
+        if (self.FORCEKEEP.indexOf(eventType) < 0 && self.EVENTSNET[eventType].length === 0) {
             destroyEventType(eventType);
         }