From b49468addf13faf738dbf5532b90a169372d6eb2 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Sun, 18 Aug 2019 20:30:43 +0000
Subject: [PATCH] If someone aborts the netuser name lookup (with Ctrl-C),
 don't print "invalid netmail address"

---
 src/sbbs3/fido.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/sbbs3/fido.cpp b/src/sbbs3/fido.cpp
index 54db0a6fa3..eb2d918b94 100644
--- a/src/sbbs3/fido.cpp
+++ b/src/sbbs3/fido.cpp
@@ -173,7 +173,8 @@ bool sbbs_t::netmail(const char *into, const char *title, long mode, smb_t* resm
 	}
 	p=strrchr(to,'@');      /* Find '@' in name@addr */
 	if(p==NULL || net_type != NET_FIDO) {
-		bputs(text[InvalidNetMailAddr]);
+		if(!(sys_status&SS_ABORT))
+			bputs(text[InvalidNetMailAddr]);
 		return false; 
 	}
 	if(!cfg.total_faddrs || (!SYSOP && !(cfg.netmail_misc&NMAIL_ALLOW))) {
-- 
GitLab