missionpinball / mpf / 33144170079

81%

push

github

Reset combo switch state when its mode stops (#2079)

* Reset combo switch state when its mode stops

A ComboSwitch keeps three pieces of state: _switches_1_active,
_switches_2_active and _state. device_removed_from_mode removed the
switch handlers and killed the pending delays but left all three
untouched.

The switches can still be held when the mode stops. That is the normal
case for any combo whose own event ends the mode that owns it, for
example a "hold both buttons to cancel the game" combo defined in a game
mode: the event tears the mode down while the player is still pressing.
With the handlers already removed the release is never seen, so the
device stays latched at 'both' with both groups marked active for the
life of the process.

Every later attempt is then dropped twice over. _switch_1_went_active
and _switch_2_went_active both open with "if self._switches_N_active:
return", so neither group ever re-arms, and _switch_state opens with "if
state == self.state: return", so even a re-armed group could not re-post
events_when_both. The combo works exactly once per process.

Reset the three attributes on mode removal. An unloaded device observes
nothing, so holding no state is the only accurate option, and a reload
re-arms from the next real switch change.

The existing test_combo_switches_in_mode releases the switches before
stopping the mode, so it never reached this path. The new test stops the
mode with both switches still down.

* Update mpf/devices/combo_switch.py

Co-authored-by: Bosh <alex@lobasc.io>

* Address review: reset combo switch state on mode start too

Extract _reset_state() and call it on both mode start and stop, so a
mode-scoped combo always starts from scratch and switches held from
before the mode started do not count. Shorten the comments. Add tests
for a mode restarted while its switches are held.

6 of 6 new or added lines in 1 file covered. (100.0%)

25759 of 31686 relevant lines covered (81.29%)

7.95 hits per line