and dont seg there.
authorraster <raster@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Mon, 6 Dec 2010 09:07:56 +0000 (09:07 +0000)
committerraster <raster@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Mon, 6 Dec 2010 09:07:56 +0000 (09:07 +0000)
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@55319 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

src/modules/engines/gl_x11/evas_engine.c

index e190e04..fb61381 100644 (file)
@@ -1159,7 +1159,8 @@ eng_image_native_set(void *data, void *image, void *native)
           if (im->native.data)
             {
               Evas_Native_Surface *ens = im->native.data;
-              if ((ens->data.x11.visual == vis) && (ens->data.x11.pixmap == pm))
+              if ((ens->data.x11.visual == vis) && 
+                  (ens->data.x11.pixmap == pm))
                 return im;
             }
         }
@@ -1178,6 +1179,8 @@ eng_image_native_set(void *data, void *image, void *native)
         im->native.func.free(im->native.func.data, im);
       evas_gl_common_image_native_disable(im);
     }
+
+  if (!ns) return im;
   
   if (ns->type == EVAS_NATIVE_SURFACE_X11)
     {