From ae9d8acc3b405be05f1d790489ed261ba7cfc518 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Fri, 9 Jun 2023 09:27:39 +0200 Subject: [PATCH] Android: when an EventFilter is binded to SDL_EVENT_DID_ENTER_FOREGROUND event and triggered, GL context is expected to be already restored. --- src/video/android/SDL_androidevents.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/video/android/SDL_androidevents.c b/src/video/android/SDL_androidevents.c index d678893c04..e667255219 100644 --- a/src/video/android/SDL_androidevents.c +++ b/src/video/android/SDL_androidevents.c @@ -116,8 +116,6 @@ void Android_PumpEvents_Blocking(SDL_VideoDevice *_this) /* Android_ResumeSem was signaled */ SDL_SendAppEvent(SDL_EVENT_WILL_ENTER_FOREGROUND); - SDL_SendAppEvent(SDL_EVENT_DID_ENTER_FOREGROUND); - SDL_SendWindowEvent(Android_Window, SDL_EVENT_WINDOW_RESTORED, 0, 0); ANDROIDAUDIO_ResumeDevices(); openslES_ResumeDevices(); @@ -136,6 +134,9 @@ void Android_PumpEvents_Blocking(SDL_VideoDevice *_this) if (SDL_TextInputActive()) { Android_StartTextInput(_this); /* Only showTextInput */ } + + SDL_SendAppEvent(SDL_EVENT_DID_ENTER_FOREGROUND); + SDL_SendWindowEvent(Android_Window, SDL_EVENT_WINDOW_RESTORED, 0, 0); } } else { if (videodata->isPausing || SDL_TryWaitSemaphore(Android_PauseSem) == 0) { @@ -198,8 +199,6 @@ void Android_PumpEvents_NonBlocking(SDL_VideoDevice *_this) /* Android_ResumeSem was signaled */ SDL_SendAppEvent(SDL_EVENT_WILL_ENTER_FOREGROUND); - SDL_SendAppEvent(SDL_EVENT_DID_ENTER_FOREGROUND); - SDL_SendWindowEvent(Android_Window, SDL_EVENT_WINDOW_RESTORED, 0, 0); if (videodata->pauseAudio) { ANDROIDAUDIO_ResumeDevices(); @@ -220,6 +219,9 @@ void Android_PumpEvents_NonBlocking(SDL_VideoDevice *_this) if (SDL_TextInputActive()) { Android_StartTextInput(_this); /* Only showTextInput */ } + + SDL_SendAppEvent(SDL_EVENT_DID_ENTER_FOREGROUND); + SDL_SendWindowEvent(Android_Window, SDL_EVENT_WINDOW_RESTORED, 0, 0); } } else { if (videodata->isPausing || SDL_TryWaitSemaphore(Android_PauseSem) == 0) {