diff options
author | Olof-Joachim Frahm <Olof.Frahm@web.de> | 2011-10-02 00:14:00 +0200 |
---|---|---|
committer | Olof-Joachim Frahm <Olof.Frahm@web.de> | 2011-10-02 00:14:00 +0200 |
commit | 360f6e32b8e466d9a63b319269b3fc5734cdc58e (patch) | |
tree | d4161c4ac9a19e1809b72b55ddd88088fef9bfeb /src/filelist.c | |
parent | 0bab331e21a046a1ec775f188feadd300c9a57f8 (diff) | |
parent | f55de5185347da52e7cd282491afdc7114418e50 (diff) |
Merge remote-tracking branches 'derf/master' and 'origin/master'
Diffstat (limited to 'src/filelist.c')
-rw-r--r-- | src/filelist.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/filelist.c b/src/filelist.c index 215f371..91b6b89 100644 --- a/src/filelist.c +++ b/src/filelist.c @@ -321,11 +321,11 @@ int feh_file_info_load(feh_file * file, Imlib_Image im) if (im) im1 = im; - else if (!feh_load_image(&im1, file)) - return(1); - - if (!im1) + else if (!feh_load_image(&im1, file) || !im1) { + if (!opt.quiet) + weprintf("couldn't load %s", file->filename); return(1); + } file->info = feh_file_info_new(); @@ -340,7 +340,7 @@ int feh_file_info_load(feh_file * file, Imlib_Image im) file->info->size = st.st_size; - if (need_free && im1) + if (need_free) gib_imlib_free_image_and_decache(im1); return(0); } |