From 44716b02363b4933af7dba8ef43487d4f5991c0b Mon Sep 17 00:00:00 2001 From: Sylvain Beucler Date: Thu, 9 Apr 2020 15:01:37 +0100 Subject: [PATCH] emscripten: Send SDL_APP_TERMINATING before unload (#88) --- src/video/emscripten/SDL_emscriptenevents.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/video/emscripten/SDL_emscriptenevents.c b/src/video/emscripten/SDL_emscriptenevents.c index ac17fb18d..6376580ea 100644 --- a/src/video/emscripten/SDL_emscriptenevents.c +++ b/src/video/emscripten/SDL_emscriptenevents.c @@ -645,6 +645,16 @@ Emscripten_HandleVisibilityChange(int eventType, const EmscriptenVisibilityChang return 0; } +static const char* +Emscripten_HandleBeforeUnload(int eventType, const void *reserved, void *userData) +{ + /* This event will need to be handled synchronously, e.g. using + SDL_AddEventWatch, as the page is being closed *now*. */ + /* No need to send a SDL_QUIT, the app won't get control again. */ + SDL_SendAppEvent(SDL_APP_TERMINATING); + return ""; /* don't trigger confirmation dialog */ +} + void Emscripten_RegisterEventHandlers(SDL_WindowData *data) { @@ -684,6 +694,8 @@ Emscripten_RegisterEventHandlers(SDL_WindowData *data) emscripten_set_resize_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, data, 0, Emscripten_HandleResize); emscripten_set_visibilitychange_callback(data, 0, Emscripten_HandleVisibilityChange); + + emscripten_set_beforeunload_callback(data, Emscripten_HandleBeforeUnload); } void @@ -726,6 +738,8 @@ Emscripten_UnregisterEventHandlers(SDL_WindowData *data) emscripten_set_resize_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, NULL, 0, NULL); emscripten_set_visibilitychange_callback(NULL, 0, NULL); + + emscripten_set_beforeunload_callback(NULL, NULL); } #endif /* SDL_VIDEO_DRIVER_EMSCRIPTEN */