summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--src/keyevents.c8
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d48bd57..a4028d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
git HEAD
* Add --no-fehbg option to disable ~/.fehbg creation (patch by Felix Crux)
+ * Pause slideshow when editing captions
Wed, 02 Nov 2011 10:56:10 +0100 Daniel Friesel <derf@finalrewind.org>
diff --git a/src/keyevents.c b/src/keyevents.c
index 3c864fb..1318d3d 100644
--- a/src/keyevents.c
+++ b/src/keyevents.c
@@ -640,8 +640,14 @@ void feh_event_handle_keypress(XEvent * ev)
slideshow_change_image(winwid, SLIDE_RAND, 1);
}
else if (feh_is_kp(&keys.toggle_caption, keysym, state)) {
- if (opt.caption_path)
+ if (opt.caption_path) {
+ /*
+ * editing captions in slideshow mode does not make any sense
+ * at all; this is just in case someone accidentally does it...
+ */
+ opt.paused = 1;
winwid->caption_entry = 1;
+ }
winwidget_render_image(winwid, 0, 0);
}
else if (feh_is_kp(&keys.reload_image, keysym, state)) {