diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2012-09-13 12:05:55 +0200 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2012-09-13 12:12:07 +0200 |
| commit | 3a1b07272aeff6397f74014cdeae2c129d608a94 (patch) | |
| tree | 73adab2a020b91b53bc67977fea83941a184e9a6 /src | |
| parent | 290b5964ef857ea52d85edf846edd82392d9a716 (diff) | |
Show error message if normal load failed (broken by 2.4) + update tests2.6.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/imlib.c | 8 |
1 files changed, 1 insertions, 7 deletions
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); } /* |