Skip to content

Commit e3b5e87

Browse files
author
Daniel K. O. (dkosmari)
committed
Avoid suppressing buttons from observer combos.
1 parent 47ef57c commit e3b5e87

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

source/ButtonComboManager.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ void ButtonComboManager::UpdateInputVPAD(const VPADChan chan, VPADStatus *buffer
436436
continue;
437437
}
438438
int activated = combo->UpdateInput(controller, std::span(mVPADButtonBuffer.data(), usedBufferSize));
439-
if (activated >= 0) {
439+
if (activated >= 0 && !combo->isObserver()) {
440440
// suppress all buttons triggered
441441
uint32_t triggered = buffer[usedBufferSize - activated - 1].trigger;
442442
mVPADSuppressed[chan] |= triggered;
@@ -527,7 +527,7 @@ void ButtonComboManager::UpdateInputWPAD(const WPADChan chan, WPADStatus *data)
527527
continue;
528528
}
529529
int activated = combo->UpdateInput(controller, std::span(&pressedButtons, 1));
530-
if (activated >= 0) {
530+
if (activated >= 0 && !combo->isObserver()) {
531531
coreBtns.blockTriggered();
532532
extBtns.blockTriggered();
533533
}

0 commit comments

Comments
 (0)