Skip to content

Commit 158011a

Browse files
committed
Bug fix Issue #7: [Akai Fire] In certain conditions, drum instruments cannot be selected
1 parent 84c0bd8 commit 158011a

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

src/main/java/com/akai/fire/sequence/DrumSequenceMode.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,10 @@ public NoteAction getPendingAction() {
455455
return pendingAction;
456456
}
457457

458+
public void clearPendingAction() {
459+
pendingAction = null;
460+
}
461+
458462
private void stepActionFixedLength(final int index) {
459463
final double newLen = positionHandler.lengthWithLastStep(index);
460464
adjustMode(newLen);
@@ -584,4 +588,6 @@ public void notifyMuteAction() {
584588
public void notifySoloAction() {
585589
soloActionsTaken.set(true);
586590
}
591+
592+
587593
}

src/main/java/com/akai/fire/sequence/PadHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,14 +183,14 @@ public void executePadSelection(final PadContainer pad) {
183183
parent.getOled().showInfo(padDisplayInfo);
184184

185185
selectedPad.updateDisplay(displayTarget.getTypeIndex());
186-
NoteAction pendingAction = parent.getPendingAction();
186+
final NoteAction pendingAction = parent.getPendingAction();
187187
if (pendingAction != null && pendingAction.getDestPadIndex() == selectedPadIndex) {
188188
if (pendingAction.getType() == Type.CLEAR) {
189189
executeClear(pendingAction.getSrcPadIndex());
190190
} else if (pendingAction.getType() == Type.COPY_PAD) {
191191
executeCopy(pendingAction.getCopyNotes(), !parent.isShiftHeld());
192192
}
193-
pendingAction = null;
193+
parent.clearPendingAction();
194194
}
195195
}
196196

0 commit comments

Comments
 (0)