From 342c94076d1f30c6edab532c13c2ff3c2f3c2050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Mon, 30 May 2022 23:15:01 +0200 Subject: [PATCH] display: Destroy unmanaged compositor a bit later This allows for things that want to get some state or manager objects (MetaLaters to be specific) a bit later in the tear down procedures. Part-of: --- src/core/display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/display.c b/src/core/display.c index 10e273237..73583828e 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -1177,14 +1177,14 @@ meta_display_close (MetaDisplay *display, /* Stop caring about events */ meta_display_free_events (display); - g_clear_pointer (&display->compositor, meta_compositor_destroy); - meta_display_shutdown_x11 (display); g_clear_object (&display->stack); g_clear_pointer (&display->stack_tracker, meta_stack_tracker_free); + g_clear_pointer (&display->compositor, meta_compositor_destroy); + /* Must be after all calls to meta_window_unmanage() since they * unregister windows */