diff options
| author | Sven Willner <sven.willner@gmail.com> | 2019-04-01 13:58:50 +0200 |
|---|---|---|
| committer | Sven Willner <sven.willner@gmail.com> | 2019-04-01 13:58:50 +0200 |
| commit | a9ffd5d2234433bc3f3829713b0968a1d6c13b94 (patch) | |
| tree | 78a78930edbf7c187e0803f367529f2aabc90627 /src/filelist.c | |
| parent | 1d3d1259590c8a600c3d800942ab5566802d3499 (diff) | |
| parent | 18dd1c5ea218c1b86e305d3ee0052335b1e22fc8 (diff) | |
Merge remote-tracking branch 'original/master'
Diffstat (limited to 'src/filelist.c')
| -rw-r--r-- | src/filelist.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/filelist.c b/src/filelist.c index 870e463..e3ae020 100644 --- a/src/filelist.c +++ b/src/filelist.c @@ -30,6 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "feh.h" #include "filelist.h" +#include "signals.h" #include "options.h" gib_list *filelist = NULL; @@ -327,6 +328,10 @@ gib_list *feh_file_info_preload(gib_list * list) feh_display_status('s'); } else if (opt.verbose) feh_display_status('.'); + if (sig_exit) { + feh_display_status(0); + exit(sig_exit); + } } if (opt.verbose) feh_display_status(0); @@ -486,7 +491,7 @@ void feh_prepare_filelist(void) * we can create a properly sized thumbnail list. */ if (opt.list || opt.preload || opt.customlist || (opt.sort > SORT_MTIME) - || (opt.filter_by_dimensions && (opt.index || opt.collage || opt.thumbs || opt.bgmode))) { + || (opt.filter_by_dimensions && (opt.index || opt.thumbs || opt.bgmode))) { /* For these sort options, we have to preload images */ filelist = feh_file_info_preload(filelist); if (!gib_list_length(filelist)) |