aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBert Münnich <ber.t@posteo.de>2014-01-08 20:31:07 +0100
committerBert Münnich <ber.t@posteo.de>2014-01-08 20:31:07 +0100
commitcd34aa2a6ba0d68482b38fbaa38789c21cfa07f3 (patch)
treebd3cc3210a7dd91fda429ccf321024f1681db3f8
parent9a0bcd7025ee1ba9eb32503c86e03a3db166484e (diff)
Fixed slideshow delay corruption after GIF animation
-rw-r--r--Makefile2
-rw-r--r--main.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 482a0b2..d9de323 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = git-20140104
+VERSION = git-20140108
PREFIX = /usr/local
MANPREFIX = $(PREFIX)/share/man
diff --git a/main.c b/main.c
index 8094265..a46cc8a 100644
--- a/main.c
+++ b/main.c
@@ -400,7 +400,8 @@ void redraw(void)
img_render(&img);
if (img.ss.on) {
t = img.ss.delay * 1000;
- t = img.multi.animate ? MAX(t, img.multi.length) : t;
+ if (img.multi.cnt > 0 && img.multi.animate)
+ t = MAX(t, img.multi.length);
set_timeout(slideshow, t, false);
}
} else {