summaryrefslogtreecommitdiff
path: root/src/mail.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mail.c')
-rw-r--r--src/mail.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mail.c b/src/mail.c
index 43d8e7845..4aa3b0a2a 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -30,15 +30,16 @@
MailInfo *MailRegBegin(User * u, NickRequest * nr, char *subject,
char *service)
{
+ int timeToWait = 0;
if (!u || !nr || !subject || !service) {
return NULL;
}
if (!UseMail) {
notice_lang(service, u, MAIL_DISABLED);
- } else if ((time(NULL) - u->lastmail < MailDelay)
- || (time(NULL) - nr->lastmail < MailDelay)) {
- notice_lang(service, u, MAIL_DELAYED, MailDelay);
+ } else if ((time(NULL) - u->lastmail < MailDelay)) {
+ timeToWait = MailDelay - (time(NULL) - u->lastmail);
+ notice_lang(service, u, MAIL_DELAYED, timeToWait);
} else if (!nr->email) {
notice_lang(service, u, MAIL_INVALID, nr->nick);
} else {