Archive: check archive mode first

This commit is contained in:
Arun Prakash Jana 2019-02-06 22:06:36 +05:30
parent cdcbb82a91
commit 0950f058f1
No known key found for this signature in database
GPG Key ID: A75979F35C080412
1 changed files with 8 additions and 5 deletions

View File

@ -3625,15 +3625,22 @@ nochange:
presel = FILTER; presel = FILTER;
goto begin; goto begin;
} }
case SEL_ARCHIVE: // fallthrough
case SEL_OPENWITH: // fallthrough case SEL_OPENWITH: // fallthrough
case SEL_RENAME: case SEL_RENAME:
if (!ndents) if (!ndents)
break; // fallthrough break; // fallthrough
case SEL_ARCHIVE: // fallthrough
case SEL_NEW: case SEL_NEW:
{ {
switch (sel) { switch (sel) {
case SEL_ARCHIVE: case SEL_ARCHIVE:
r = get_input("archive selection (else current)? [s]");
if (r == 's' && !cpsafe())
goto nochange;
else if (!ndents) {
printmsg("no files");
goto nochange;
}
tmp = xreadline(NULL, "archive name: "); tmp = xreadline(NULL, "archive name: ");
break; break;
case SEL_OPENWITH: case SEL_OPENWITH:
@ -3670,11 +3677,7 @@ nochange:
goto nochange; goto nochange;
} }
r = get_input("archive selection (else current)? [s]");
if (r == 's') { if (r == 's') {
if (!cpsafe())
goto nochange;
snprintf(g_buf, CMD_LEN_MAX, snprintf(g_buf, CMD_LEN_MAX,
#ifdef __linux__ #ifdef __linux__
"xargs -0 -a %s %s %s", "xargs -0 -a %s %s %s",