From ea626a50594513faa86174ae7dd58101d7c8dd2d Mon Sep 17 00:00:00 2001 From: Daniel van Vugt Date: Wed, 2 Jun 2021 16:45:04 +0800 Subject: [PATCH] main: Avoid calling meta_wayland_compositor_get_default() on X11 Because it contains an assertion that will fail, and crash. Started in 301d2c55c6. Part-of: --- src/core/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/core/main.c b/src/core/main.c index b7b5d1449..3d82773ba 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -309,13 +309,16 @@ meta_finalize (void) MetaDisplay *display = meta_get_display (); MetaBackend *backend = meta_get_backend (); #ifdef HAVE_WAYLAND - MetaWaylandCompositor *compositor = meta_wayland_compositor_get_default (); + MetaWaylandCompositor *compositor = NULL; #endif if (backend) meta_backend_prepare_shutdown (backend); #ifdef HAVE_WAYLAND + if (meta_is_wayland_compositor ()) + compositor = meta_wayland_compositor_get_default (); + if (compositor) meta_wayland_compositor_prepare_shutdown (compositor); #endif