aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--image.c3
-rw-r--r--nsxiv.h2
2 files changed, 3 insertions, 2 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);
diff --git a/nsxiv.h b/nsxiv.h
index fc0720c..978962e 100644
--- a/nsxiv.h
+++ b/nsxiv.h
@@ -180,7 +180,7 @@ typedef struct {
unsigned int cnt;
unsigned int sel;
bool animate;
- unsigned int framedelay;
+ int framedelay;
int length;
} multi_img_t;