summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDennis Real <github@tildepipe.org>2012-07-23 22:28:16 +0200
committerDennis Real <github@tildepipe.org>2012-07-23 22:28:16 +0200
commit676ff730e7db5cbeba778d1bca4aa26b15a93f07 (patch)
tree63676af820ed93702525a526f0c88cc0efc0d5c1 /src
parent50676a24151060a314d80b2413ae9784ea8433aa (diff)
parenta62c48c7bd46c4e193738c7d391c529c528ee4dc (diff)
Merge branch 'master' of git://github.com/derf/feh
Diffstat (limited to 'src')
-rw-r--r--src/slideshow.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/slideshow.c b/src/slideshow.c
index 337e202..3ccf2f1 100644
--- a/src/slideshow.c
+++ b/src/slideshow.c
@@ -65,7 +65,7 @@ void init_slideshow_mode(void)
winwidget_show(w);
if (opt.slideshow_delay > 0.0)
feh_add_timer(cb_slide_timer, w, opt.slideshow_delay, "SLIDE_CHANGE");
- else if (opt.reload > 0)
+ if (opt.reload > 0)
feh_add_unique_timer(cb_reload_timer, w, opt.reload);
break;
} else {