xserver: Branch 'master'
Keith Packard
keithp at kemper.freedesktop.org
Sat Nov 23 21:39:03 PST 2013
hw/xnest/GCOps.c | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 6d5883bd7e5b765f8f0548501b825d9e56840799
Author: Keith Packard <keithp at keithp.com>
Date: Sat Nov 23 16:19:46 2013 -0800
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 at minilop.net>
Signed-off-by: Egbert Eich <eich at freedesktop.org>
Reviewed-by: Jamey Sharp <jamey at minilop.net>
diff --git a/hw/xnest/GCOps.c b/hw/xnest/GCOps.c
index 7b1956d..d00511d 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) {
More information about the xorg-commit
mailing list