diff --git a/ChangeLog b/ChangeLog index 55d4630d8b..c50c3b6544 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-01-21 Carsten Haitzler (The Rasterman) + + * Fix xsync problem in ecore_x_image_get() where prior errors + can get caught. + 2013-01-18 Jihoon Kim (jihoon) * edje entry: remove ecore_imf_context_reset in mouse up event because it's useless. diff --git a/NEWS b/NEWS index 48b660d99a..aae56af8cd 100644 --- a/NEWS +++ b/NEWS @@ -122,3 +122,4 @@ Fixes: * Evas text: Fixed issue with horiz advance. * Evas text utils: Fixed issue with no-harfbuzz bidi. * Fixed pixman surface alloc where allocated and image size differ. + * Fixed x11 error sync issue with ecore_x_image_get() diff --git a/src/lib/ecore_x/xlib/ecore_x_image.c b/src/lib/ecore_x/xlib/ecore_x_image.c index e8319b9370..97606f50b1 100644 --- a/src/lib/ecore_x/xlib/ecore_x_image.c +++ b/src/lib/ecore_x/xlib/ecore_x_image.c @@ -230,6 +230,8 @@ ecore_x_image_get(Ecore_X_Image *im, return 0; _ecore_x_image_err = 0; + + ecore_x_sync(); // optimised path ph = XSetErrorHandler((XErrorHandler)_ecore_x_image_error_handler); if ((sx == 0) && (w == im->w))