summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorpolygamma <jonny.westphalen@googlemail.com>2017-10-09 16:14:13 +0200
committerCarlos Garnacho <carlosg@gnome.org>2017-10-10 13:55:40 +0200
commitf9c625924e5358afd3e47733e68d166770edd496 (patch)
treece2273ae9e460e37c72a5e64b2e0b8b48bdda473 /src
parent64cb735abf83d876abeb7f6f9cc601f2908b50c2 (diff)
downloadmutter-f9c625924e5358afd3e47733e68d166770edd496.tar.gz
x11: Protect XChangeProperty call with error traps
They may happen around the time a window is destroyed, thus could result on BadWindow X errors. https://bugzilla.gnome.org/show_bug.cgi?id=788666
Diffstat (limited to 'src')
-rw-r--r--src/x11/window-x11.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
index 36a5e70a3..4885f5fea 100644
--- a/src/x11/window-x11.c
+++ b/src/x11/window-x11.c
@@ -920,11 +920,13 @@ update_gtk_edge_constraints (MetaWindow *window)
meta_verbose ("Setting _GTK_EDGE_CONSTRAINTS to %lu\n", data[0]);
+ meta_error_trap_push (window->display);
XChangeProperty (window->display->xdisplay,
window->xwindow,
window->display->atom__GTK_EDGE_CONSTRAINTS,
XA_CARDINAL, 32, PropModeReplace,
(guchar*) data, 1);
+ meta_error_trap_pop (window->display);
}
static gboolean