aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBert Münnich <ber.t@posteo.de>2015-08-19 21:29:39 +0200
committerBert Münnich <ber.t@posteo.de>2015-08-19 21:29:39 +0200
commita3838c19841af4cc721121469d178236697df462 (patch)
treead9bdf9cef1701fc0e983c6974a9b61378f9f2db
parentd8114e841c5b5933a655a3ec728cedd37b86d27d (diff)
Always run image-info script after key-handler in image mode; fixes issue #213
-rw-r--r--Makefile2
-rw-r--r--main.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 8957a46..54342a3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION := git-20150722
+VERSION := git-20150819
PREFIX := /usr/local
MANPREFIX := $(PREFIX)/share/man
diff --git a/main.c b/main.c
index 61b8ea7..179dcc0 100644
--- a/main.c
+++ b/main.c
@@ -491,7 +491,7 @@ void run_key_handler(const char *key, unsigned int mask)
bool changed = false;
int f, i, pfd[2], retval, status;
int fcnt = marked ? markcnt : 1;
- char kstr[32], oldbar[BAR_L_LEN];
+ char kstr[32];
struct stat *oldst, st;
if (keyhandler.cmd == NULL) {
@@ -515,7 +515,6 @@ void run_key_handler(const char *key, unsigned int mask)
}
oldst = s_malloc(fcnt * sizeof(*oldst));
- memcpy(oldbar, win.bar.l.buf, sizeof(oldbar));
strncpy(win.bar.l.buf, "Running key handler...", win.bar.l.size);
win_draw(&win);
win_set_cursor(&win, CURSOR_WATCH);
@@ -572,7 +571,8 @@ end:
img_close(&img, true);
load_image(fileidx);
} else if (info.cmd != NULL) {
- memcpy(win.bar.l.buf, oldbar, win.bar.l.size);
+ info.open = false;
+ open_info();
}
}
free(oldst);