From 6d5883bd7e5b765f8f0548501b825d9e56840799 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sat, 23 Nov 2013 16:19:46 -0800
Subject: [PATCH] xnest: Ignore GetImage() error in xnestGetImage() (v3)

(I found an amended version of this patch and applied the difference
here - keithp)

v3: Don't call Xsync before restoring error handler as any errors
    generated by XGetImage() should be processed when this call
    returns as suggested by Jamey Sharp <jamey@minilop.net>

Signed-off-by: Egbert Eich <eich@freedesktop.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
---
 hw/xnest/GCOps.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hw/xnest/GCOps.c b/hw/xnest/GCOps.c
index 7b1956de0..d00511d71 100644
--- a/hw/xnest/GCOps.c
+++ b/hw/xnest/GCOps.c
@@ -115,7 +115,6 @@ xnestGetImage(DrawablePtr pDrawable, int x, int y, int w, int h,
 
     ximage = XGetImage(xnestDisplay, xnestDrawable(pDrawable),
                        x, y, w, h, planeMask, format);
-    XSync(xnestDisplay, False);
     XSetErrorHandler(old_handler);
 
     if (ximage) {