fix: loading storage with more channels than faders. (e.g. a fader co…

…ntrolling a 5.1 setup)
olzzon · Feb 3, 2020 · 93e10ec · 93e10ec
1 parent b181378
commit 93e10ec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/server/utils/SettingsStorage.ts b/server/utils/SettingsStorage.ts
@@ -50,7 +50,7 @@ export const loadSnapshotState = (stateSnapshot: any, stateChannelSnapshot: any,
             });
         } else {
             stateChannelSnapshot.channel = stateChannelSnapshot.channel.map((channel: any, index: number) => {
-                if (index < numberOfFaders) {
+                if (stateFromFile.channelState.channel[index].assignedFader >= 0) {
                     channel.auxLevel = stateFromFile.channelState.channel[index].auxLevel || []
                     channel.assignedFader = stateFromFile.channelState.channel[index].assignedFader
                 } else {

diff --git a/server/utils/mixerConnections/OscMixerConnection.ts b/server/utils/mixerConnections/OscMixerConnection.ts
@@ -297,10 +297,12 @@ export class OscMixerConnection {
                     if (item.type === 'aux') {
                         state.channels[0].channel.forEach((channel: any, index: number) => {
                             channel.auxLevel.forEach((auxLevel: any, auxIndex: number) => {
+                                if (channel.assignedFader >= 0){
                                 setTimeout(() => {
-                                    this.sendOutRequestAux(item.mixerMessage, auxIndex +1, state.faders[0].fader[channel.assignedFader].monitor)
-                                },
-                                state.faders[0].fader[channel.assignedFader].monitor * 10 + auxIndex * 100)
+                                        this.sendOutRequestAux(item.mixerMessage, auxIndex +1, state.faders[0].fader[channel.assignedFader].monitor)
+                                    },
+                                    state.faders[0].fader[channel.assignedFader].monitor * 10 + auxIndex * 100)
+                                }  
                             })
                         })
                     } else {