From c5cd668a522f607db139a80851e3fa465594a894 Mon Sep 17 00:00:00 2001 From: Maxim Baz Date: Thu, 19 Dec 2019 14:11:30 +0100 Subject: [PATCH] Show 'invalid key' prompt in more places (#415) --- src/nnn.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/nnn.c b/src/nnn.c index a30320bf..cf2826fd 100644 --- a/src/nnn.c +++ b/src/nnn.c @@ -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;