summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2012-07-18 22:06:41 +0200
committerDaniel Friesel <derf@finalrewind.org>2012-07-18 22:06:41 +0200
commita62c48c7bd46c4e193738c7d391c529c528ee4dc (patch)
tree6bdfa747b7320df54696ea9c1bc5f521ca91db50
parentbacb9a0da68a3aaa8fe5df27b953038e68b60400 (diff)
slideshow: -D and -R need not be mutually exclusive
-rw-r--r--ChangeLog1
-rw-r--r--src/slideshow.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ba6faaa..bcde5bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ git HEAD
<https://github.com/derf/feh/issues/91>
* menu: simpler background, remove drop shadows
* Remove --menu-style support (deprecated in 1.12)
+ * Allow --slideshow-delay and --reload to be used together
Sun, 25 Mar 2012 13:13:26 +0200 Daniel Friesel <derf@finalrewind.org>
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 {