From 3b3d64abd92e8b75f1533f9681609a940e6bd3a2 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Sat, 19 Nov 2011 19:22:53 +0100 Subject: pause slideshow when editing a caption --- ChangeLog | 1 + src/keyevents.c | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) 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 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)) { -- cgit v1.2.3