aboutsummaryrefslogtreecommitdiffstats
path: root/image.c
diff options
context:
space:
mode:
authorNRK <nrk@disroot.org>2024-06-18 17:08:37 +0200
committerNRK <nrk@disroot.org>2024-06-18 17:08:37 +0200
commit36d5b27fff21f4b8475a594dabbd7b59630c9bee (patch)
tree1d2a955bbde869d8231a83c0338510fda112d328 /image.c
parentfaf67fcc62307ad8847a78939d5ed222a53e5ea8 (diff)
downloadnsxiv-36d5b27fff21f4b8475a594dabbd7b59630c9bee.tar.zst
fix: -A not working (#503)
the imlib2 based multi-frame loader has not respected -A setting since it's introduction in commit 76c2b81b. also change multi.framedelay to `int` to avoid signedness change warning. Reviewed-on: https://codeberg.org/nsxiv/nsxiv/pulls/503 Reviewed-by: eylles <eylles@noreply.codeberg.org>
Diffstat (limited to 'image.c')
-rw-r--r--image.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/image.c b/image.c
index dd91994..50d792f 100644
--- a/image.c
+++ b/image.c
@@ -234,7 +234,8 @@ static bool img_load_multiframe(img_t *img, const fileinfo_t *file)
imlib_context_set_blend(!!(finfo.frame_flags & IMLIB_FRAME_BLEND));
imlib_blend_image_onto_image(frame, has_alpha, 0, 0, sw, sh, sx, sy, sw, sh);
m->frames[m->cnt].im = canvas;
- m->frames[m->cnt].delay = finfo.frame_delay ? finfo.frame_delay : DEF_ANIM_DELAY;
+ m->frames[m->cnt].delay = m->framedelay ? m->framedelay :
+ (finfo.frame_delay ? finfo.frame_delay : DEF_ANIM_DELAY);
m->length += m->frames[m->cnt].delay;
m->cnt++;
img_free(frame, false);