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

Fixup for 9574150

Browse Source
This commit is contained in:
Bert Münnich
2014-01-08 21:14:01 +01:00
parent 9574150f2d
commit 9632dd88b9
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main.c
View File

@@ -459,7 +459,7 @@ void key_handler(const char *key, unsigned int mask)
pid_t pid; pid_t pid;
int retval, status, n = mode == MODE_IMAGE ? fileidx : tns.sel; int retval, status, n = mode == MODE_IMAGE ? fileidx : tns.sel;
char *cmd = exec[EXEC_KEY].cmd, kstr[32]; char *cmd = exec[EXEC_KEY].cmd, kstr[32];
struct stat oldstat, newstat; struct stat oldst, newst;
if (cmd == NULL || key == NULL) if (cmd == NULL || key == NULL)
return; return;
@@ -469,7 +469,7 @@ void key_handler(const char *key, unsigned int mask)
mask & Mod1Mask ? "M-" : "", mask & Mod1Mask ? "M-" : "",
mask & ShiftMask ? "S-" : "", key); mask & ShiftMask ? "S-" : "", key);
stat(files[n].path, &oldstat); stat(files[n].path, &oldst);
if ((pid = fork()) == 0) { if ((pid = fork()) == 0) {
execl(cmd, cmd, kstr, files[n].path, NULL); execl(cmd, cmd, kstr, files[n].path, NULL);
@@ -486,10 +486,12 @@ void key_handler(const char *key, unsigned int mask)
if (WIFEXITED(status) == 0 || retval != 0) if (WIFEXITED(status) == 0 || retval != 0)
warn("key handler exited with non-zero return value: %d", retval); warn("key handler exited with non-zero return value: %d", retval);
if (stat(files[n].path, &newstat) == 0 && if (stat(files[n].path, &newst) == 0 &&
memcmp(&oldstat, &newstat, sizeof(oldstat)) == 0) memcmp(&oldst.st_mtime, &newst.st_mtime, sizeof(oldst.st_mtime)) == 0)
{ {
/* file has not changed */ /* file has not changed */
win_set_cursor(&win, CURSOR_ARROW);
set_timeout(reset_cursor, TO_CURSOR_HIDE, true);
return; return;
} }
if (mode == MODE_IMAGE) { if (mode == MODE_IMAGE) {