brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main: Avoid calling meta_wayland_compositor_get_default() on X11

Browse Source 
Because it contains an assertion that will fail, and crash.
Started in 301d2c55c6.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1883>
This commit is contained in:
Daniel van Vugt 2021-06-02 16:45:04 +08:00
parent 936696afcf
commit ea626a5059
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/main.c
View File

@ -309,13 +309,16 @@ meta_finalize (void)
MetaDisplay *display = meta_get_display (); MetaDisplay *display = meta_get_display ();
MetaBackend *backend = meta_get_backend (); MetaBackend *backend = meta_get_backend ();
#ifdef HAVE_WAYLAND #ifdef HAVE_WAYLAND
MetaWaylandCompositor *compositor = meta_wayland_compositor_get_default (); MetaWaylandCompositor *compositor = NULL;
#endif #endif
if (backend) if (backend)
meta_backend_prepare_shutdown (backend); meta_backend_prepare_shutdown (backend);
#ifdef HAVE_WAYLAND #ifdef HAVE_WAYLAND
if (meta_is_wayland_compositor ())
compositor = meta_wayland_compositor_get_default ();
if (compositor) if (compositor)
meta_wayland_compositor_prepare_shutdown (compositor); meta_wayland_compositor_prepare_shutdown (compositor);
#endif #endif