mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-28 05:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disable dir watch in filter mode

Browse source
This commit is contained in:
Arun Prakash Jana 2017-08-23 03:28:26 +05:30
parent fb521a7a94
commit be337d883e
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
nnn.c
View file

@ -785,21 +785,35 @@ nextsel(char **run, char **env, int *presel)
if (c == 0) if (c == 0)
c = getch(); c = getch();
else else {
*presel = 0; *presel = 0;
/* Unwatch dir if we are still in a filtered view */
#ifdef LINUX_INOTIFY
if (inotify_wd >= 0) {
inotify_rm_watch(inotify_fd, inotify_wd);
inotify_wd = -1;
}
#elif defined(BSD_KQUEUE)
if (event_fd >= 0) {
close(event_fd);
event_fd = -1;
}
#endif
}
if (c == -1) { if (c == -1) {
++idle; ++idle;
#ifdef LINUX_INOTIFY
/* Do not check for directory changes in du /* Do not check for directory changes in du
* mode. A redraw forces du calculation. * mode. A redraw forces du calculation.
* Check for changes every odd second. * Check for changes every odd second.
*/ */
if (!cfg.blkorder && inotify_wd >= 0 && idle & 1) #ifdef LINUX_INOTIFY
if (read(inotify_fd, inotify_buf, EVENT_BUF_LEN) > 0) if (!cfg.blkorder && inotify_wd >= 0 && idle & 1 && read(inotify_fd, inotify_buf, EVENT_BUF_LEN) > 0)
#elif defined(BSD_KQUEUE) #elif defined(BSD_KQUEUE)
if (!cfg.blkorder && event_fd >= 0 && idle & 1) if (!cfg.blkorder && event_fd >= 0 && idle & 1
if (kevent(kq, events_to_monitor, NUM_EVENT_SLOTS, event_data, NUM_EVENT_FDS, &gtimeout) > 0) && kevent(kq, events_to_monitor, NUM_EVENT_SLOTS, event_data, NUM_EVENT_FDS, &gtimeout) > 0)
#endif #endif
c = CONTROL('L'); c = CONTROL('L');
} else } else
@ -2492,7 +2506,7 @@ nochange:
break; break;
/* Open the descriptor to currently open directory */ /* Open the descriptor to currently open directory */
fd = open(path, O_RDONLY | O_DIRECTORY | O_NOATIME); fd = open(path, O_RDONLY | O_DIRECTORY);
if (fd == -1) { if (fd == -1) {
printwarn(); printwarn();
goto nochange; goto nochange;