From bad4f4e5ac4a609822630a2fab2d688886d3e1f2 Mon Sep 17 00:00:00 2001
From: Frank Praznik <[EMAIL REDACTED]>
Date: Tue, 18 Apr 2023 13:06:41 -0400
Subject: [PATCH] wayland: Destroy proxy wrappers before and callbacks before
event queues
Destroy any proxy wrappers and callbacks before the associated event queues to silence libwayland warnings about destroying the queues while proxies are still attached.
---
src/video/wayland/SDL_waylandwindow.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
index aadbf1760e9f..cce9f6814352 100644
--- a/src/video/wayland/SDL_waylandwindow.c
+++ b/src/video/wayland/SDL_waylandwindow.c
@@ -2278,9 +2278,9 @@ void Wayland_DestroyWindow(_THIS, SDL_Window *window)
SDL_free(wind->outputs);
if (wind->gles_swap_frame_callback) {
- WAYLAND_wl_event_queue_destroy(wind->gles_swap_frame_event_queue);
- WAYLAND_wl_proxy_wrapper_destroy(wind->gles_swap_frame_surface_wrapper);
wl_callback_destroy(wind->gles_swap_frame_callback);
+ WAYLAND_wl_proxy_wrapper_destroy(wind->gles_swap_frame_surface_wrapper);
+ WAYLAND_wl_event_queue_destroy(wind->gles_swap_frame_event_queue);
}
if (wind->surface_frame_callback) {