From 70013f2719243f63d2e688c7acb30a2a536415ce Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sat, 17 Feb 2001 20:39:53 +0000 Subject: [PATCH] oops - minor logic hiccup - fixed.. also imlib2 fix for its load error checking. missed this when adding db style (key in file) loading. SVN revision: 4239 --- legacy/evas/src/evas_image.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/legacy/evas/src/evas_image.c b/legacy/evas/src/evas_image.c index b660d51bd5..5585445305 100644 --- a/legacy/evas/src/evas_image.c +++ b/legacy/evas/src/evas_image.c @@ -60,7 +60,7 @@ evas_add_image_from_file(Evas e, char *file) { Imlib_Image im; - im = imlib_load_image_with_error_return(file, &oo->load_error); + im = imlib_load_image_with_error_return(file, &(oo->load_error)); if (im) { imlib_context_set_image(im); @@ -159,7 +159,7 @@ evas_set_image_file(Evas e, Evas_Object o, char *file) o->changed = 1; e->changed = 1; } - else + else if (!file) { if (oo->current.file) free(oo->current.file);