src/nnn.c | 25 ++++++++++++++-----------

diff --git a/src/nnn.c b/src/nnn.c
index e5babc8945fc139952a84dfbd7edb5bd0bb55b32..578d79e17e77c06e7a6dfa450c97ce1bb6fdbb93 100644
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -370,12 +370,14 @@ #define STR_INPUT_ID 0
 #define STR_INVBM_KEY 1
 #define STR_DATE_ID 2
 #define STR_TMPFILE 3
+#define NONE_SELECTED 4
 
 static const char * const messages[] = {
 	"no traversal",
 	"invalid key",
 	"%F %T %z",
 	"/.nnnXXXXXX",
+	"empty selection",
 };
 
 /* Supported configuration environment variables */
@@ -1842,7 +1844,7 @@ /*
  * Create symbolic/hard link(s) to file(s) in selection list
  * Returns the number of links created
  */
-static int xlink(char *suffix, char *path, char *buf, int type)
+static int xlink(char *suffix, char *path, char *buf, int *presel, int type)
 {
 	int count = 0;
 	char *pbuf = pcopybuf, *fname;
@@ -1850,15 +1852,15 @@ 	ssize_t pos = 0, len, r;
 	int (*link_fn)(const char *, const char *) = NULL;
 
 	/* Check if selection is empty */
-	if (!copybufpos)
-		return 0;
+	if (!copybufpos) {
+		printwait(messages[NONE_SELECTED], presel);
+		return -1;
+	}
 
 	if (type == 's') /* symbolic link */
 		link_fn = &symlink;
-	else if (type == 'h') /* hard link */
+	else /* hard link */
 		link_fn = &link;
-	else
-		return -1;
 
 	while (pos < copybufpos) {
 		len = strlen(pbuf);
@@ -1872,6 +1874,9 @@
 		pos += len + 1;
 		pbuf += len + 1;
 	}
+
+	if (!count)
+		printwait("none created", presel);
 
 	return count;
 }
@@ -3707,7 +3712,7 @@ 					presel = FILTER;
 				break;
 			}
 
-			printwait("none selected", &presel);
+			printwait(messages[NONE_SELECTED], &presel);
 			goto nochange;
 		case SEL_CP:
 		case SEL_MV:
@@ -3894,13 +3899,11 @@ 					r = mkdirat(fd, tmp, 0777);
 				} else if (r == 's' || r == 'h') {
 					if (tmp[0] == '@' && tmp[1] == '\0')
 						tmp[0] = '\0';
-					r = xlink(tmp, path, newpath, r);
+					r = xlink(tmp, path, newpath, &presel, r);
 					close(fd);
 
-					if (r <= 0) {
-						printwait("none created", &presel);
+					if (r <= 0)
 						goto nochange;
-					}
 
 					if (cfg.filtermode)
 						presel = FILTER;