nsxiva3838c1
Always run image-info script after key-handler in image mode; fixes issue #213
+4 −4
2 files changed
| @@ -1,4 +1,4 @@ | |||
| 1 | − | VERSION := git-20150722 | |
| 1 | + | VERSION := git-20150819 | |
| 2 | 2 | ||
| 3 | 3 | PREFIX := /usr/local | |
| 4 | 4 | MANPREFIX := $(PREFIX)/share/man | |
| @@ -491,7 +491,7 @@ void run_key_handler(const char *key, unsigned int mask) | |||
| 491 | 491 | bool changed = false; | |
| 492 | 492 | int f, i, pfd[2], retval, status; | |
| 493 | 493 | int fcnt = marked ? markcnt : 1; | |
| 494 | − | char kstr[32], oldbar[BAR_L_LEN]; | |
| 494 | + | char kstr[32]; | |
| 495 | 495 | struct stat *oldst, st; | |
| 496 | 496 | ||
| 497 | 497 | if (keyhandler.cmd == NULL) { | |
| @@ -515,7 +515,6 @@ void run_key_handler(const char *key, unsigned int mask) | |||
| 515 | 515 | } | |
| 516 | 516 | oldst = s_malloc(fcnt * sizeof(*oldst)); | |
| 517 | 517 | ||
| 518 | − | memcpy(oldbar, win.bar.l.buf, sizeof(oldbar)); | |
| 519 | 518 | strncpy(win.bar.l.buf, "Running key handler...", win.bar.l.size); | |
| 520 | 519 | win_draw(&win); | |
| 521 | 520 | win_set_cursor(&win, CURSOR_WATCH); | |
| @@ -572,7 +571,8 @@ end: | |||
| 572 | 571 | img_close(&img, true); | |
| 573 | 572 | load_image(fileidx); | |
| 574 | 573 | } else if (info.cmd != NULL) { | |
| 575 | − | memcpy(win.bar.l.buf, oldbar, win.bar.l.size); | |
| 574 | + | info.open = false; | |
| 575 | + | open_info(); | |
| 576 | 576 | } | |
| 577 | 577 | } | |
| 578 | 578 | free(oldst); | |