Wait for fullscreen exit

Author: Lgt2x

Descent3/config.cpp

@@ -762,6 +762,9 @@ static void config_gamma() {
 //////////////////////////////////////////////////////////////////
 // VIDEO MENU
 //
+
+#include <SDL3/SDL_events.h>
+#include <iostream>
 struct video_menu {
   newuiSheet *sheet;
 

renderer/HardwareBaseGPU.cpp

@@ -347,6 +347,10 @@ int rend_SetPreferredState(renderer_preferred_state *pref_state, bool reinit) {
   if (gpu_state.initted) {
     LOG_DEBUG << "Inside pref state!";
 
+    if (old_state.fullscreen != pref_state->fullscreen) {
+      rend_SetFullScreen(pref_state->fullscreen);
+    }
+
     if (pref_state->width != gpu_state.screen_width || pref_state->height != gpu_state.screen_height ||
         old_state.bit_depth != pref_state->bit_depth || reinit) {
       rend_ReInit();
@@ -355,9 +359,6 @@ int rend_SetPreferredState(renderer_preferred_state *pref_state, bool reinit) {
     if (old_state.gamma != pref_state->gamma) {
       rend_SetGammaValue(pref_state->gamma);
     }
-    if (old_state.fullscreen != pref_state->fullscreen) {
-      rend_SetFullScreen(pref_state->fullscreen);
-    }
   } else {
     gpu_preferred_state = *pref_state;
   }

renderer/HardwareOpenGL.cpp

@@ -1146,6 +1146,14 @@ void rend_SetFullScreen(bool fullscreen) {
     LOG_DEBUG.printf("Entering fullscreen mode");
   } else {
     LOG_DEBUG.printf("Exiting fullscreen mode");
+    SDL_Event event;
+    while (1)
+    {
+        SDL_WaitEvent(&event);
+        if (event.type == SDL_EVENT_WINDOW_LEAVE_FULLSCREEN) {
+          break;
+        }
+    }
   }
 }