summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/core/ns_group.c2
-rw-r--r--src/core/ns_register.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/ns_group.c b/src/core/ns_group.c
index c3e458ed1..af181e092 100644
--- a/src/core/ns_group.c
+++ b/src/core/ns_group.c
@@ -72,7 +72,7 @@ class CommandNSGroup : public Command
if (!(target = findnick(nick)))
notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
else if (time(NULL) < u->lastnickreg + NSRegDelay)
- notice_lang(s_NickServ, u, NICK_GROUP_PLEASE_WAIT, NSRegDelay);
+ notice_lang(s_NickServ, u, NICK_GROUP_PLEASE_WAIT, (NSRegDelay + u->lastnickreg) - time(NULL));
else if (u->nc && (u->nc->flags & NI_SUSPENDED))
{
alog("%s: %s!%s@%s tried to use GROUP from SUSPENDED nick %s", s_NickServ, u->nick, u->GetIdent().c_str(), u->host, target->nick);
diff --git a/src/core/ns_register.c b/src/core/ns_register.c
index 359ca3912..c3f068326 100644
--- a/src/core/ns_register.c
+++ b/src/core/ns_register.c
@@ -251,7 +251,7 @@ class CommandNSRegister : public CommandNSConfirm
if (NSForceEmail && !email)
this->OnSyntaxError(u);
else if (time(NULL) < u->lastnickreg + NSRegDelay)
- notice_lang(s_NickServ, u, NICK_REG_PLEASE_WAIT, NSRegDelay);
+ notice_lang(s_NickServ, u, NICK_REG_PLEASE_WAIT, (u->lastnickreg + NSRegDelay) - time(NULL));
else if ((na = findnick(u->nick)))
{
/* i.e. there's already such a nick regged */