Alexander/nsxiv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always run image-info script after key-handler in image mode; fixes issue #213

Browse Source
This commit is contained in:
Bert Münnich 2015-08-19 21:29:39 +02:00
parent d8114e841c
commit a3838c1984
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,4 +1,4 @@
VERSION := git-20150722 VERSION := git-20150819
PREFIX := /usr/local PREFIX := /usr/local
MANPREFIX := $(PREFIX)/share/man MANPREFIX := $(PREFIX)/share/man

6
main.c
View File

@ -491,7 +491,7 @@ void run_key_handler(const char *key, unsigned int mask)
bool changed = false; bool changed = false;
int f, i, pfd[2], retval, status; int f, i, pfd[2], retval, status;
int fcnt = marked ? markcnt : 1; int fcnt = marked ? markcnt : 1;
char kstr[32], oldbar[BAR_L_LEN]; char kstr[32];
struct stat *oldst, st; struct stat *oldst, st;
if (keyhandler.cmd == NULL) { if (keyhandler.cmd == NULL) {
@ -515,7 +515,6 @@ void run_key_handler(const char *key, unsigned int mask)
} }
oldst = s_malloc(fcnt * sizeof(*oldst)); 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); strncpy(win.bar.l.buf, "Running key handler...", win.bar.l.size);
win_draw(&win); win_draw(&win);
win_set_cursor(&win, CURSOR_WATCH); win_set_cursor(&win, CURSOR_WATCH);
@ -572,7 +571,8 @@ end:
img_close(&img, true); img_close(&img, true);
load_image(fileidx); load_image(fileidx);
} else if (info.cmd != NULL) { } else if (info.cmd != NULL) {
memcpy(win.bar.l.buf, oldbar, win.bar.l.size); info.open = false;
open_info();
} }
} }
free(oldst); free(oldst);