diff options
Diffstat (limited to 'firmware/target/hosted/sdl')
-rw-r--r-- | firmware/target/hosted/sdl/button-sdl.c | 2 | ||||
-rw-r--r-- | firmware/target/hosted/sdl/system-sdl.c | 13 | ||||
-rw-r--r-- | firmware/target/hosted/sdl/system-sdl.h | 1 |
3 files changed, 15 insertions, 1 deletions
diff --git a/firmware/target/hosted/sdl/button-sdl.c b/firmware/target/hosted/sdl/button-sdl.c index eb4869ae25..91338bb0d5 100644 --- a/firmware/target/hosted/sdl/button-sdl.c +++ b/firmware/target/hosted/sdl/button-sdl.c @@ -278,7 +278,7 @@ static bool event_handler(SDL_Event *event) } case SDL_QUIT: /* Will post SDL_USEREVENT in shutdown_hw() if successful. */ - sys_poweroff(); + sdl_sys_quit(); break; case SDL_USEREVENT: return true; diff --git a/firmware/target/hosted/sdl/system-sdl.c b/firmware/target/hosted/sdl/system-sdl.c index 9904da4346..572d6d570a 100644 --- a/firmware/target/hosted/sdl/system-sdl.c +++ b/firmware/target/hosted/sdl/system-sdl.c @@ -196,6 +196,14 @@ static int sdl_event_thread(void * param) return 0; } +static bool quitting; + +void sdl_sys_quit(void) +{ + quitting = true; + sys_poweroff(); +} + void power_off(void) { /* Shut down SDL event loop */ @@ -270,6 +278,11 @@ void system_reboot(void) void system_exception_wait(void) { + if (evt_thread) + { + while (!quitting) + SDL_Delay(10); + } system_reboot(); } diff --git a/firmware/target/hosted/sdl/system-sdl.h b/firmware/target/hosted/sdl/system-sdl.h index 43ee0bdff1..3568910fae 100644 --- a/firmware/target/hosted/sdl/system-sdl.h +++ b/firmware/target/hosted/sdl/system-sdl.h @@ -56,6 +56,7 @@ void sys_poweroff(void); void sys_handle_argv(int argc, char *argv[]); void gui_message_loop(void); void sim_do_exit(void) NORETURN_ATTR; +void sdl_sys_quit(void); extern bool background; /* True if the background image is enabled */ extern bool showremote; |