and handle that other case...

SVN revision: 4241
This commit is contained in:
Carsten Haitzler 2001-02-17 21:52:18 +00:00
parent 70013f2719
commit 33a9fe85dc
1 changed files with 9 additions and 1 deletions

View File

@ -119,7 +119,10 @@ evas_set_image_file(Evas e, Evas_Object o, char *file)
IF_OBJ(o, OBJECT_IMAGE) return; IF_OBJ(o, OBJECT_IMAGE) return;
oo = o; oo = o;
if (((oo->current.file) && (file) && (strcmp(file, oo->current.file))) || if (((oo->current.file) && (file) && (strcmp(file, oo->current.file))) ||
((!oo->current.file) && (file))) ((!oo->current.file) && (file)) ||
(oo->current.image.w == 0) ||
(oo->current.image.h == 0)
)
{ {
if (oo->current.file) if (oo->current.file)
free(oo->current.file); free(oo->current.file);
@ -145,6 +148,7 @@ evas_set_image_file(Evas e, Evas_Object o, char *file)
} }
else else
{ {
printf("load failed ->%s<-!\n", file);
oo->current.image.w = 0; oo->current.image.w = 0;
oo->current.image.h = 0; oo->current.image.h = 0;
evas_resize(e, o, evas_resize(e, o,
@ -161,6 +165,7 @@ evas_set_image_file(Evas e, Evas_Object o, char *file)
} }
else if (!file) else if (!file)
{ {
printf("!file\n");
if (oo->current.file) if (oo->current.file)
free(oo->current.file); free(oo->current.file);
oo->previous.file = NULL; oo->previous.file = NULL;
@ -178,6 +183,9 @@ evas_set_image_file(Evas e, Evas_Object o, char *file)
o->changed = 1; o->changed = 1;
e->changed = 1; e->changed = 1;
} }
else
{
}
} }
void void