Merge pull request #339 from bbc/fix/nullish-test-not-truthy

Fix/nullish test not truthy
tv2 · Oct 11, 2024 · dd8e61a · dd8e61a
2 parents bc6faaa + 38b4c28
commit dd8e61a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/server/src/utils/AutomationConnection.ts b/server/src/utils/AutomationConnection.ts
@@ -221,15 +221,15 @@ export class AutomationConnection {
                 wrapChannelCommand((ch: any) => {
                     const apiState: AutomationChannelAPI = JSON.parse(message.args[0])
                     const channelState: Fader = {... state.faders[0].fader[ch - 1],
-                        faderLevel: apiState.faderLevel || state.faders[0].fader[ch - 1].faderLevel,
-                        pgmOn: apiState.pgmOn || state.faders[0].fader[ch - 1].pgmOn,
-                        voOn: apiState.voOn || state.faders[0].fader[ch - 1].voOn,
-                        pstOn: apiState.pstOn   || state.faders[0].fader[ch - 1].pstOn,
-                        showChannel: apiState.showChannel || state.faders[0].fader[ch - 1].showChannel,
-                        muteOn: apiState.muteOn || state.faders[0].fader[ch - 1].muteOn,
-                        inputGain: apiState.inputGain || state.faders[0].fader[ch - 1].inputGain,
-                        inputSelector: apiState.inputSelector || state.faders[0].fader[ch - 1].inputSelector,
-                        label: apiState.label || state.faders[0].fader[ch - 1].label,
+                        faderLevel: apiState.faderLevel ?? state.faders[0].fader[ch - 1].faderLevel,
+                        pgmOn: apiState.pgmOn ?? state.faders[0].fader[ch - 1].pgmOn,
+                        voOn: apiState.voOn ?? state.faders[0].fader[ch - 1].voOn,
+                        pstOn: apiState.pstOn ?? state.faders[0].fader[ch - 1].pstOn,
+                        showChannel: apiState.showChannel ?? state.faders[0].fader[ch - 1].showChannel,
+                        muteOn: apiState.muteOn ?? state.faders[0].fader[ch - 1].muteOn,
+                        inputGain: apiState.inputGain ?? state.faders[0].fader[ch - 1].inputGain,
+                        inputSelector: apiState.inputSelector ?? state.faders[0].fader[ch - 1].inputSelector,
+                        label: apiState.label ?? state.faders[0].fader[ch - 1].label,
                     }
                     store.dispatch({
                         type: FaderActionTypes.SET_SINGLE_FADER_STATE,

diff --git a/server/src/utils/MixerConnection.ts b/server/src/utils/MixerConnection.ts
@@ -459,6 +459,7 @@ export class MixerGenericConnection {
             channel: channelIndex,
             level: targetVal,
         })
+        this.currentOutputLevel[channelIndex] = targetVal
         sendChLevelsToOuputServer(mixerIndex, channelIndex, targetVal)
         this.delayedFadeActiveDisable(mixerIndex, channelIndex)
     }