From d2dc1f438bc41d865315dcb07b95abf26032e87a Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Thu, 17 Feb 2011 18:38:56 +0000 Subject: [PATCH] Ecore_X_Image: Add trap for potential missing XImage. if Ecore_X_Image-->XImage does not exist, we call _ecore_x_image_shm_create to create it via shm, BUT that function can return a NULL XImage if shm is not supported, so we need to check the return of that, else we are calling XShmPutImage with no XImage. (NB: This should probably be backported to 1.0...if someone could handle that please ?) SVN revision: 57130 --- legacy/ecore/src/lib/ecore_x/xlib/ecore_x_image.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_image.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_image.c index 151a61ebe5..93db745336 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_image.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_image.c @@ -292,7 +292,8 @@ ecore_x_image_put(Ecore_X_Image *im, gc = tgc; } if (!im->xim) _ecore_x_image_shm_create(im); - XShmPutImage(_ecore_x_disp, draw, gc, im->xim, sx, sy, x, y, w, h, False); + if (im->xim) + XShmPutImage(_ecore_x_disp, draw, gc, im->xim, sx, sy, x, y, w, h, False); if (tgc) ecore_x_gc_free(tgc); } /* ecore_x_image_put */