From a62c48c7bd46c4e193738c7d391c529c528ee4dc Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Wed, 18 Jul 2012 22:06:41 +0200 Subject: slideshow: -D and -R need not be mutually exclusive --- ChangeLog | 1 + src/slideshow.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ba6faaa..bcde5bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ git HEAD * 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 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 { -- cgit v1.2.3