summaryrefslogtreecommitdiff
path: root/src/compositor/compositor.c
diff options
context:
space:
mode:
authorVictor Kareh <[email protected]>2019-05-30 15:09:05 -0400
committerraveit65 <[email protected]>2019-06-16 18:12:44 +0200
commitf424a92933a07a7135023c47bfbee8f77bb68659 (patch)
tree7b923f85799b3512b7ea26019dfa5a642a1efbc7 /src/compositor/compositor.c
parent01417e5675fba04549ab0f818fc83a57969b257c (diff)
downloadmarco-f424a92933a07a7135023c47bfbee8f77bb68659.tar.bz2
marco-f424a92933a07a7135023c47bfbee8f77bb68659.tar.xz
compositor: fix possible crash closing/destroying window
Partially restore call to destroy_win in compositor when calling meta_window_free. This is needed to ensure that we never call meta_window_get_frame_bounds while windows is destroying. https://bugzilla.gnome.org/show_bug.cgi?id=751833 upstream commit: https://gitlab.gnome.org/GNOME/metacity/commit/a9f28dbc
Diffstat (limited to 'src/compositor/compositor.c')
-rw-r--r--src/compositor/compositor.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
index 7e3c79c2..39344e82 100644
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -156,6 +156,10 @@ void meta_compositor_end_move (MetaCompositor *compositor,
void meta_compositor_free_window (MetaCompositor *compositor,
MetaWindow *window)
{
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+ if (compositor && compositor->free_window)
+ compositor->free_window (compositor, window);
+#endif
}
void