diff --git a/client/components/ChanStrip.tsx b/client/components/ChanStrip.tsx index 8691e806..9e564757 100644 --- a/client/components/ChanStrip.tsx +++ b/client/components/ChanStrip.tsx @@ -379,56 +379,75 @@ class ChanStrip extends React.PureComponent -
- {this.props.label || ("FADER " + (this.props.faderIndex + 1))} - - -
-
- {window.location.search.includes('settings=0') ? - null : + if (this.props.faderIndex >= 0) { + return ( +
+
+ {this.props.label || ("FADER " + (this.props.faderIndex + 1))} - } - {window.location.search.includes('settings=0') ? + +
+
+ {window.location.search.includes('settings=0') ? null : - + + } + {window.location.search.includes('settings=0') ? + null : + + } +
+
+ {this.props.offtubeMode ? + this.parameters() + : null }
-
- {this.props.offtubeMode ? - this.parameters() - : null - } -
- ) - } + ) + } else { + return ( +
+
+ ) + } + } } const mapStateToProps = (state: any, props: any): IChanStripInjectProps => { - return { - label: state.faders[0].fader[props.faderIndex].label, + let inject: IChanStripInjectProps = { + label: '', selectedProtocol: state.settings[0].mixerProtocol, numberOfChannelsInType: state.settings[0].numberOfChannelsInType, channel: state.channels[0].channel, fader: state.faders[0].fader, - auxSendIndex: state.faders[0].fader[props.faderIndex].monitor - 1, + auxSendIndex: -1, offtubeMode: state.settings[0].offtubeMode } + if (props.faderIndex >= 0) { + inject = { + label: state.faders[0].fader[props.faderIndex].label, + selectedProtocol: state.settings[0].mixerProtocol, + numberOfChannelsInType: state.settings[0].numberOfChannelsInType, + channel: state.channels[0].channel, + fader: state.faders[0].fader, + auxSendIndex: state.faders[0].fader[props.faderIndex].monitor - 1, + offtubeMode: state.settings[0].offtubeMode + } + } + return inject } export default connect(mapStateToProps)(ChanStrip) as any; diff --git a/client/components/Channels.tsx b/client/components/Channels.tsx index 8aabd355..bd1c8142 100644 --- a/client/components/Channels.tsx +++ b/client/components/Channels.tsx @@ -73,7 +73,7 @@ class Channels extends React.Component { : null } - {(this.props.settings.showChanStrip >= 0) ? + {(this.props.settings.showChanStrip >= 0 || this.props.settings.offtubeMode) ? : null