From 0950f058f1bf634aa787c88d6b4f0f53e2956761 Mon Sep 17 00:00:00 2001
From: Arun Prakash Jana <engineerarun@gmail.com>
Date: Wed, 6 Feb 2019 22:06:36 +0530
Subject: [PATCH] Archive: check archive mode first

---
 src/nnn.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/nnn.c b/src/nnn.c
index 00ac1f4b..16170f22 100644
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -3625,15 +3625,22 @@ nochange:
 				presel = FILTER;
 			goto begin;
 		}
-		case SEL_ARCHIVE: // fallthrough
 		case SEL_OPENWITH: // fallthrough
 		case SEL_RENAME:
 			if (!ndents)
 				break; // fallthrough
+		case SEL_ARCHIVE: // fallthrough
 		case SEL_NEW:
 		{
 			switch (sel) {
 			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: ");
 				break;
 			case SEL_OPENWITH:
@@ -3670,11 +3677,7 @@ nochange:
 					goto nochange;
 				}
 
-				r = get_input("archive selection (else current)? [s]");
 				if (r == 's') {
-					if (!cpsafe())
-						goto nochange;
-
 					snprintf(g_buf, CMD_LEN_MAX,
 #ifdef __linux__
 						 "xargs -0 -a %s %s %s",