fix: checkFxCommands didn´t filter out non numbered

olzzon · Oct 30, 2020 · d98f592 · d98f592
1 parent 5e4ae42
commit d98f592
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 28 deletions.
diff --git a/client/components/ChanStripFull.tsx b/client/components/ChanStripFull.tsx
@@ -146,6 +146,8 @@ class ChanStripFull extends React.PureComponent<
     }
 
     handleFx(fxParam: fxParamsList, level: any) {
+        if (level < 0) { level = 0}
+        if (level > 1) { level = 1}
         window.socketIoClient.emit(SOCKET_SET_FX, {
             fxParam: fxParam,
             channel: this.props.faderIndex,

diff --git a/server/utils/mixerConnections/OscMixerConnection.ts b/server/utils/mixerConnections/OscMixerConnection.ts
@@ -443,38 +443,39 @@ export class OscMixerConnection {
     }
 
     checkFxCommands(message: any) {
-        Object.keys(fxParamsList)
-            .filter((fxKey: number | string) => {
-                return typeof fxKey === 'string'
-            })
-            .forEach((keyName: string) => {
-                let fxKey = keyName as keyof typeof fxParamsList
-                if (
-                    this.checkOscCommand(
-                        message.address,
-                        this.mixerProtocol.channelTypes[0].fromMixer[
-                            fxParamsList[fxKey]
-                        ][0].mixerMessage
-                    )
-                ) {
-                    let ch = message.address.split('/')[this.cmdChannelIndex]
-                    store.dispatch(
-                        storeFaderFx(
-                            fxParamsList[fxKey],
-                            state.channels[0].chConnection[this.mixerIndex]
-                                .channel[ch - 1].assignedFader,
-                            message.args[0]
-                        )
-                    )
-                    global.mainThreadHandler.updatePartialStore(
+        Object.keys(fxParamsList).forEach((keyName: string) => {
+            if (!isNaN(parseFloat(keyName))) {
+                return
+            }
+
+            let fxKey = keyName as keyof typeof fxParamsList
+            if (
+                this.checkOscCommand(
+                    message.address,
+                    this.mixerProtocol.channelTypes[0].fromMixer[
+                        fxParamsList[fxKey]
+                    ][0].mixerMessage
+                )
+            ) {
+                let ch = message.address.split('/')[this.cmdChannelIndex]
+                store.dispatch(
+                    storeFaderFx(
+                        fxParamsList[fxKey],
                         state.channels[0].chConnection[this.mixerIndex].channel[
                             ch - 1
-                        ].assignedFader
+                        ].assignedFader,
+                        message.args[0]
                     )
-                }
+                )
+                global.mainThreadHandler.updatePartialStore(
+                    state.channels[0].chConnection[this.mixerIndex].channel[
+                        ch - 1
+                    ].assignedFader
+                )
+            }
 
-                console.log(fxKey)
-            })
+            console.log(fxKey)
+        })
     }
 
     checkOscCommand(message: string, command: string): boolean {