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

Fix issue with running plugin when help screen is shown

Browse source
This commit is contained in:
Arun Prakash Jana 2019-11-15 22:36:37 +05:30
parent 688ed885d1
commit f31fa09f56
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/nnn.c
View file

@ -3375,6 +3375,8 @@ static void show_help(const char *path)
static bool plctrl_init(void) static bool plctrl_init(void)
{ {
snprintf(g_buf, CMD_LEN_MAX, "nnn-pipe.%d", getpid()); snprintf(g_buf, CMD_LEN_MAX, "nnn-pipe.%d", getpid());
/* g_tmpfpath is used to generate tmp file names */
g_tmpfpath[g_tmpfplen - 1] = '\0';
mkpath(g_tmpfpath, g_buf, g_pipepath); mkpath(g_tmpfpath, g_buf, g_pipepath);
unlink(g_pipepath); unlink(g_pipepath);
if (mkfifo(g_pipepath, 0600) != 0) if (mkfifo(g_pipepath, 0600) != 0)
@ -3395,9 +3397,8 @@ static bool run_selected_plugin(char **path, const char *file, char *newpath, ch
g_plinit = TRUE; g_plinit = TRUE;
} }
if ((cfg.runctx != cfg.curctx)
/* Must be in plugin directory to select plugin */ /* Must be in plugin directory to select plugin */
|| (!direct && strcmp(*path, plugindir) != 0)) if (!direct && ((cfg.runctx != cfg.curctx) || (strcmp(*path, plugindir) != 0)))
return FALSE; return FALSE;
fd = open(g_pipepath, O_RDONLY | O_NONBLOCK); fd = open(g_pipepath, O_RDONLY | O_NONBLOCK);
@ -4972,12 +4973,13 @@ nochange:
spawn(newpath, (ndents ? dents[cur].name : NULL), spawn(newpath, (ndents ? dents[cur].name : NULL),
NULL, path, F_CLI | F_CONFIRM); NULL, path, F_CLI | F_CONFIRM);
} else { } else {
cfg.runctx = cfg.curctx;
if (!run_selected_plugin(&path, tmp, newpath, NULL, if (!run_selected_plugin(&path, tmp, newpath, NULL,
(ndents ? dents[cur].name : NULL), (ndents ? dents[cur].name : NULL),
&lastname, &lastdir, TRUE)) &lastname, &lastdir, TRUE)) {
if (cfg.filtermode)
presel = FILTER;
goto nochange; goto nochange;
}
} }
} else { } else {
cfg.runplugin ^= 1; cfg.runplugin ^= 1;