Fix: checkOSC command, if {channel} was last parameter in command it …

…returned false
olzzon · May 21, 2019 · c959bf0 · c959bf0
1 parent 4512985
commit c959bf0
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/src/utils/OscMixerConnection.js b/src/utils/OscMixerConnection.js
@@ -177,15 +177,21 @@ export class OscMixerConnection {
         if (message === command) return true;
 
         let cmdArray = command.split("{channel}");
-        if (
-            message.substr(0, cmdArray[0].length) === cmdArray[0] &&
-            message.substr(-cmdArray[1].length) === cmdArray[1] &&
-            message.length >= command.replace("{channel}", "").length
-        ) {
-            return true;
-        } else {
-            return false;
+        if (message.substr(0, cmdArray[0].length) === cmdArray[0])
+        {
+            if (
+                message.substr(-cmdArray[1].length) === cmdArray[1] &&
+                message.length >= command.replace("{channel}", "").length
+            ) {
+                return true;
+            } else if (
+                cmdArray[1] = "" &&
+                message.length >= command.replace("{channel}", "").length
+            ) {
+                return true;
+            }
         }
+        return false;
     }
 
     sendOutMessage(oscMessage, channel, value, type) {