From 3d47f834e07a43173d9db1357701259becbdb5f7 Mon Sep 17 00:00:00 2001 From: David Redondo Date: Tue, 23 Jan 2024 09:18:01 +0100 Subject: [PATCH] client: Destroy window manager integration before display Like the globals window manager integration needs the display to be alive. Fixes: QTBUG-121364 Change-Id: I3bf10737f9c1aa6d0b3c34d2268532ea6fc4e957 Reviewed-by: David Edmundson --- src/plugins/platforms/wayland/qwaylanddisplay.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.cpp b/src/plugins/platforms/wayland/qwaylanddisplay.cpp index 890fed19920..43f9443fbec 100644 --- a/src/plugins/platforms/wayland/qwaylanddisplay.cpp +++ b/src/plugins/platforms/wayland/qwaylanddisplay.cpp @@ -373,6 +373,7 @@ QWaylandDisplay::~QWaylandDisplay(void) // Reset the globals manually since they need to be destroyed before the wl_display mGlobals = {}; + mWindowManagerIntegration.reset(); if (object()) wl_registry_destroy(object());