Преглед изворни кода

wayland: Cleanup an outdated conditional and comment

There may have been a reason for not attaching a null buffer when destroying a popup at some point in the past, but that is unnecessary now, as is the comment about ShowWindow crashing, as ShowWindow assures that a null buffer is attached before (re)creating the window.

(cherry picked from commit 550d95e04f2a89e4f890e6bdeec6357e2074eb08)
Frank Praznik пре 1 месец
родитељ
комит
c1f67585e6
1 измењених фајлова са 3 додато и 5 уклоњено
  1. 3 5
      src/video/wayland/SDL_waylandwindow.c

+ 3 - 5
src/video/wayland/SDL_waylandwindow.c

@@ -2153,11 +2153,9 @@ void Wayland_HideWindow(SDL_VideoDevice *_this, SDL_Window *window)
         }
     }
 
-    // Be sure to detach after this is done, otherwise ShowWindow crashes!
-    if (wind->shell_surface_type != WAYLAND_SHELL_SURFACE_TYPE_XDG_POPUP) {
-        wl_surface_attach(wind->surface, NULL, 0, 0);
-        wl_surface_commit(wind->surface);
-    }
+    // Attach a null buffer to unmap the surface.
+    wl_surface_attach(wind->surface, NULL, 0, 0);
+    wl_surface_commit(wind->surface);
 
     SDL_zero(wind->shell_surface);
     wind->show_hide_sync_required = true;