summaryrefslogtreecommitdiff
path: root/src/slideshow.c
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2018-02-14 22:35:06 +0100
committerDaniel Friesel <derf@finalrewind.org>2018-02-14 22:35:06 +0100
commit14a9702bb2365e51a6f8854f85a13b6e5cf4001c (patch)
tree6a6c396f017f4e4c10794d74e3550481be580477 /src/slideshow.c
parent4abbd21f698945a662ed57e2dad6b6b25de9e474 (diff)
parent5e75b5ef3e7d0270913c04645398bc3596c2a90a (diff)
Merge branch 'ulteq-dimension-pruning-without-preload'
Diffstat (limited to 'src/slideshow.c')
-rw-r--r--src/slideshow.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/slideshow.c b/src/slideshow.c
index c6d82a6..d56c1b6 100644
--- a/src/slideshow.c
+++ b/src/slideshow.c
@@ -360,16 +360,20 @@ void slideshow_change_image(winwidget winwid, int change, int render)
tzoom = winwid->zoom;
}
- if ((winwidget_loadimage(winwid, FEH_FILE(current_file->data)))
- != 0) {
+ if (winwidget_loadimage(winwid, FEH_FILE(current_file->data))) {
+ int w = gib_imlib_image_get_width(winwid->im);
+ int h = gib_imlib_image_get_height(winwid->im);
+ if (feh_should_ignore_image(winwid->im)) {
+ last = current_file;
+ continue;
+ }
winwid->mode = MODE_NORMAL;
winwid->file = current_file;
- if ((winwid->im_w != gib_imlib_image_get_width(winwid->im))
- || (winwid->im_h != gib_imlib_image_get_height(winwid->im)))
+ if ((winwid->im_w != w) || (winwid->im_h != h))
winwid->had_resize = 1;
winwidget_reset_image(winwid);
- winwid->im_w = gib_imlib_image_get_width(winwid->im);
- winwid->im_h = gib_imlib_image_get_height(winwid->im);
+ winwid->im_w = w;
+ winwid->im_h = h;
if (opt.keep_zoom_vp) {
/* put back in: */
winwid->mode = tmode;