Skip to content

Commit

Permalink
Fix: fadeOut didn´t end if fader was exactly === min
Browse files Browse the repository at this point in the history
  • Loading branch information
olzzon committed May 6, 2019
1 parent f022d79 commit 2868a62
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/utils/MixerConnection.js
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ export class MixerConnection {
outputLevel -= step;
this.mixerConnection.updateFadeIOLevel(channelIndex, outputLevel);

if ( outputLevel < min ){
if ( outputLevel <= min ){
outputLevel=min;
this.mixerConnection.updateFadeIOLevel(channelIndex, outputLevel);
clearInterval(this.timer[channelIndex]);
Expand Down
3 changes: 2 additions & 1 deletion src/utils/OscMixerConnection.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ export class OscMixerConnection {
channel: ch - 1,
level: message.args[0]
});
if (!this.store.channels[0].channel[ch - 1].pgmOn) {
if (!this.store.channels[0].channel[ch - 1].pgmOn
&& message.args[0] > this.mixerProtocol.fader.min) {
window.storeRedux.dispatch({
type:'TOGGLE_PGM',
channel: ch - 1
Expand Down

0 comments on commit 2868a62

Please sign in to comment.