From c959bf0d3337357bab0f14b5e6dedde593529e79 Mon Sep 17 00:00:00 2001 From: olzzon Date: Tue, 21 May 2019 10:19:59 +0200 Subject: [PATCH] Fix: checkOSC command, if {channel} was last parameter in command it returned false --- src/utils/OscMixerConnection.js | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/utils/OscMixerConnection.js b/src/utils/OscMixerConnection.js index 0d09ef7b..6050b666 100644 --- 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) {