From 17ff995a3907a704417d40f3259624e8cb89ec06 Mon Sep 17 00:00:00 2001
From: piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Sat, 8 Mar 2008 13:05:17 +0000
Subject: - mail: fix forward error for 'x' address

git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3978 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 mbbsd/mail.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mbbsd')

diff --git a/mbbsd/mail.c b/mbbsd/mail.c
index 485bd394..d599afa0 100644
--- a/mbbsd/mail.c
+++ b/mbbsd/mail.c
@@ -1947,7 +1947,7 @@ doforward(const char *direct, const fileheader_t * fh, int mode)
     char            genbuf[PATHLEN];
     int             return_no;
 
-    if (!address[0])
+    if (!address[0] && strcmp(cuser.email, "x") != 0)
      	strlcpy(address, cuser.email, sizeof(address));
 
     if( mode == 'U' ){
@@ -1956,7 +1956,7 @@ doforward(const char *direct, const fileheader_t * fh, int mode)
     trim(address);
 
     // if user has address and not the default 'x' (no-email)...
-    if (address[0] && strcmp(address, "x") != 0) {
+    if (address[0]) {
 	snprintf(genbuf, sizeof(genbuf),
 		 "�T�w��H�� [%s] ��(Y/N/Q)�H[Y] ", address);
 	getdata(b_lines, 0, genbuf, fname, 3, LCECHO);
-- 
cgit v1.2.3