summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Ã…dahl <jadahl@gmail.com>2022-05-30 23:15:01 +0200
committerRobert Mader <robert.mader@posteo.de>2022-12-17 15:13:48 +0100
commit342c94076d1f30c6edab532c13c2ff3c2f3c2050 (patch)
tree8a79ebfa3b5c1e358319bf77a92157dd25913ce6
parente9cd2b60a66464cb5ee44d7ae2038f2cafc3b481 (diff)
downloadmutter-342c94076d1f30c6edab532c13c2ff3c2f3c2050.tar.gz
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: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2718>
-rw-r--r--src/core/display.c4
1 files 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
*/