diff options
| author | Dana Conrad <dconrad@fastmail.com> | 2021-05-16 15:01:26 -0500 |
|---|---|---|
| committer | Dana Conrad <dconrad@fastmail.com> | 2021-05-27 19:58:09 -0500 |
| commit | 8056b7fd1a333fe4d0c7ed8d3de0caf702f89164 (patch) | |
| tree | c0b114af2cbfaa2ded440a2fc5c8b2b377613d9a /apps/main.c | |
| parent | 10d199f9d5bf85136211c0811e29679787343375 (diff) | |
Yes/No Screen: Allow accept to be button release
Allows the ACTION_YESNO_ACCEPT action to be set
to a button release by ignoring certain system events.
Moving USB init in main.c to the last thing to prevent
getting stuck in the USB prompt, if enabled.
Also changing ACTION_YESNO_ACCEPT to button release on erosq
Change-Id: I5e7498521a13cb4e840223dd0b9c8633e99093bc
Diffstat (limited to 'apps/main.c')
| -rw-r--r-- | apps/main.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/apps/main.c b/apps/main.c index 3c549a8e63..c7b223faea 100644 --- a/apps/main.c +++ b/apps/main.c @@ -321,10 +321,6 @@ static void init(void) global_status.font_id[i] = FONT_SYSFIXED; font_init(); show_logo(); -#ifndef USB_NONE - usb_init(); - usb_start_monitoring(); -#endif button_init(); powermgmt_init(); backlight_init(); @@ -374,6 +370,13 @@ static void init(void) audio_init(); talk_announce_voice_invalid(); /* notify user w/ voice prompt if voice file invalid */ settings_apply_skins(); + +/* do USB last so prompt (if enabled) can work correctly if USB was inserted with device off, + * also doesn't hurt that it will display the nice pretty backdrop this way too. */ +#ifndef USB_NONE + usb_init(); + usb_start_monitoring(); +#endif } #else /* CONFIG_PLATFORM & PLATFORM_HOSTED */ |