summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlberts Muktupāvels <alberts.muktupavels@gmail.com>2017-04-01 16:51:10 +0300
committerAlberts Muktupāvels <alberts.muktupavels@gmail.com>2017-04-01 16:51:10 +0300
commitcc87afcd9aa0d98890cf1eb0571cb244b1189ad4 (patch)
tree90989ee042545c4ea1780d3888e72226ad52c96d
parent650fd09a0aa9582e66c325e69831abfcb790a000 (diff)
downloadmetacity-cc87afcd9aa0d98890cf1eb0571cb244b1189ad4.tar.gz
xrender: add error trap in sync_window_geometry
Same code before 8b0ed193cfa771ec1f3ba70b272b9b14e02e6d3c commit was protected with error trap. Add it back.
-rw-r--r--src/compositor/meta-compositor-xrender.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/compositor/meta-compositor-xrender.c b/src/compositor/meta-compositor-xrender.c
index 180a15a1..3db7367b 100644
--- a/src/compositor/meta-compositor-xrender.c
+++ b/src/compositor/meta-compositor-xrender.c
@@ -2934,6 +2934,8 @@ meta_compositor_xrender_sync_window_geometry (MetaCompositor *compositor,
if (cw == NULL)
return;
+ meta_error_trap_push (window->display);
+
meta_window_get_input_rect (window, &rect);
if (xrender->debug)
@@ -3071,6 +3073,8 @@ meta_compositor_xrender_sync_window_geometry (MetaCompositor *compositor,
add_damage (xrender, damage);
xrender->clip_changed = TRUE;
+
+ meta_error_trap_pop (window->display);
}
static void