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

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

View File

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