diff options
| author | Selene ToyKeeper | 2023-11-05 16:30:22 -0700 |
|---|---|---|
| committer | Selene ToyKeeper | 2023-11-05 16:30:22 -0700 |
| commit | 8be907fd831c377692ba4508a10595ee95cbdc90 (patch) | |
| tree | 5e7ead3b5c51eb7ec2a08292cda02d0a7cdae791 | |
| parent | Merge branch 'DurvalMenezes-undef_USE_MANUAL_MEMORY_fix' into trunk (diff) | |
| parent | Fix compile error when Simple UI is undefined. (diff) | |
| download | anduril-8be907fd831c377692ba4508a10595ee95cbdc90.tar.gz anduril-8be907fd831c377692ba4508a10595ee95cbdc90.tar.bz2 anduril-8be907fd831c377692ba4508a10595ee95cbdc90.zip | |
Merge branch 'bugfix/no-simple-ui-error' of github.com:johnou/anduril into johnou-bugfix/no-simple-ui-error
* 'bugfix/no-simple-ui-error' of github.com:johnou/anduril:
Fix compile error when Simple UI is undefined.
Diffstat (limited to '')
| -rw-r--r-- | ui/anduril/channel-modes.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ui/anduril/channel-modes.c b/ui/anduril/channel-modes.c index ccac58c..8bd746d 100644 --- a/ui/anduril/channel-modes.c +++ b/ui/anduril/channel-modes.c @@ -126,11 +126,14 @@ uint8_t channel_mode_state(Event event, uint16_t arg) { if (cfg.simple_ui_active) { return EVENT_NOT_HANDLED; } + #if NUM_CHANNEL_MODES > 1 + else + #endif #endif #if NUM_CHANNEL_MODES > 1 - // channel toggle menu on ... 9H? - else if (event == EV_click9_hold) { + // channel toggle menu on ... 9H? (only if not in SIMPLE UI or if SIMPLE UI is inactive) + if (event == EV_click9_hold) { push_state(channel_mode_config_state, 0); return EVENT_HANDLED; } |