Browse Source

Only minimize the window for an assert if it's in exclusive fullscreen mode

Sam Lantinga 2 years ago
parent
commit
177a6f38e0
2 changed files with 4 additions and 2 deletions
  1. 1 1
      src/SDL_assert.c
  2. 3 1
      test/testwm.c

+ 1 - 1
src/SDL_assert.c

@@ -213,7 +213,7 @@ static SDL_AssertState SDLCALL SDL_PromptAssertion(const SDL_AssertData *data, v
     /* Leave fullscreen mode, if possible (scary!) */
     window = SDL_GetFocusWindow();
     if (window) {
-        if ((SDL_GetWindowFlags(window) & SDL_WINDOW_FULLSCREEN) != 0) {
+        if (window->fullscreen_exclusive) {
             SDL_MinimizeWindow(window);
         } else {
             /* !!! FIXME: ungrab the input if we're not fullscreen? */

+ 3 - 1
test/testwm.c

@@ -182,7 +182,9 @@ void loop()
         if (event.type == SDL_EVENT_KEY_UP) {
             SDL_bool updateCursor = SDL_FALSE;
 
-            if (event.key.keysym.sym == SDLK_LEFT) {
+            if (event.key.keysym.sym == SDLK_a) {
+                SDL_assert(!"Keyboard generated assert");
+            } else if (event.key.keysym.sym == SDLK_LEFT) {
                 --system_cursor;
                 if (system_cursor < 0) {
                     system_cursor = SDL_NUM_SYSTEM_CURSORS - 1;