summaryrefslogtreecommitdiff
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
parent50676a24151060a314d80b2413ae9784ea8433aa (diff)
parenta62c48c7bd46c4e193738c7d391c529c528ee4dc (diff)
Merge branch 'master' of git://github.com/derf/feh
-rw-r--r--ChangeLog1
-rw-r--r--man/feh.pre2
-rw-r--r--src/slideshow.c2
3 files changed, 3 insertions, 2 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/man/feh.pre b/man/feh.pre
index fcf3ad6..7254428 100644
--- a/man/feh.pre
+++ b/man/feh.pre
@@ -902,7 +902,7 @@ An example entry would be
.
.Pp
.
-You cane use this theme in two ways. Either call
+You can use this theme in two ways. Either call
.Qo
.Nm
-Timagemap *.jpg
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 {