Fixes small conflict on a new commit #5580
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
On the PR #5470 (Allows intruments to keep the midi channel information when forwarding), merged on Jun 1st 2020
commit 97680e0
, there's a line removed on the src/gui/widgets/InstrumentMidiIOView.cpp file (m_outputChannelSpinBox->setEnabled( false );
), because since the output channel is now relevant even when MIDI forwarding is disabled, we need that spinbox always enabled. It was also disconnected from the LedButton to keep it from disabling/enabling it.On the PR #5171 (Removed the excessive margin in instruments' GUI (#5129)), merged on Jul 9th 2020
commit 9895472
, the line was reintroduced, possibly because it was an older PR that wasn't rebased to the latest changes. This broke the output channel spinbox because now it was disabled on the constructor, but it was still disconnected from the LedButton, as a result always disabled.This hotfix removes the line again to fix the issue.