From 3a1b07272aeff6397f74014cdeae2c129d608a94 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Thu, 13 Sep 2012 12:05:55 +0200 Subject: Show error message if normal load failed (broken by 2.4) + update tests --- src/imlib.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/imlib.c') diff --git a/src/imlib.c b/src/imlib.c index 3ffc538..b3abc8a 100644 --- a/src/imlib.c +++ b/src/imlib.c @@ -234,10 +234,7 @@ int feh_load_image(Imlib_Image * im, feh_file * file) tmpname = feh_magick_load_image(file->filename); } - if (image_source != SRC_IMLIB) { - if (tmpname == NULL) - return 0; - + if ((image_source != SRC_IMLIB) && tmpname) { *im = imlib_load_image_with_error_return(tmpname, &err); if (im) { real_filename = file->filename; @@ -336,9 +333,6 @@ static char *feh_magick_load_image(char *filename) if (WIFSIGNALED(status)) weprintf("%s - Conversion took too long, skipping", filename); - else - weprintf("%s - No loader for that file format", - filename); } /* -- cgit v1.2.3