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

Show 'invalid key' prompt in more places (#415)

Browse source
This commit is contained in:
Maxim Baz 2019-12-19 14:11:30 +01:00 committed by Mischievous Meerkat
parent c24efdbedb
commit c5cd668a52
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/nnn.c
View file

@ -3339,7 +3339,7 @@ static bool remote_mount(char *newpath, int *presel)
cmd = utils[UTIL_RCLONE]; cmd = utils[UTIL_RCLONE];
env = xgetenv("NNN_RCLONE_OPTS", "rclone mount"); env = xgetenv("NNN_RCLONE_OPTS", "rclone mount");
} else { } else {
printwait(messages[MSG_FAILED], presel); printwait(messages[MSG_INVALID_KEY], presel);
return FALSE; return FALSE;
} }
@ -5338,8 +5338,16 @@ nochange:
goto begin; goto begin;
} }
if (r != 'm' || !archive_mount(dents[cur].name, path, newpath, &presel)) if (r != 'm') {
goto nochange; // fallthrough printwait(messages[MSG_INVALID_KEY], &presel);
goto nochange;
}
if (!archive_mount(dents[cur].name, path, newpath, &presel)) {
printwait(messages[MSG_FAILED], &presel);
goto nochange;
}
// fallthrough
case SEL_REMOTE: case SEL_REMOTE:
if (sel == SEL_REMOTE && !remote_mount(newpath, &presel)) if (sel == SEL_REMOTE && !remote_mount(newpath, &presel))
goto nochange; goto nochange;