summaryrefslogtreecommitdiff
path: root/src/cmd_user.cpp
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-10-28 19:42:29 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-10-28 19:42:29 +0000
commit494d7f7489a78df919c1e9effcb0a014e8dc2286 (patch)
tree899de300ca31691b6dfb1be8ae1ba250d58ae830 /src/cmd_user.cpp
parent1085e6aa40bdac42bd427394e649f0d08b881c2a (diff)
* Fix removal of user modes when unloading the mode letter (this actually works now)
* Fix m_stripcolor channel mode +S (was unsettable as it had some user mode checks in it) git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5577 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/cmd_user.cpp')
-rw-r--r--src/cmd_user.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cmd_user.cpp b/src/cmd_user.cpp
index d6565ce11..208e04380 100644
--- a/src/cmd_user.cpp
+++ b/src/cmd_user.cpp
@@ -55,7 +55,8 @@ CmdResult cmd_user::Handle (const char** parameters, int pcnt, userrec *user)
if (user->registered == REG_NICKUSER)
{
/* user is registered now, bit 0 = USER command, bit 1 = sent a NICK command */
- ServerInstance->next_call = ServerInstance->Time() + ServerInstance->Config->dns_timeout;
+ if (ServerInstance->next_call > ServerInstance->Time() + ServerInstance->Config->dns_timeout)
+ ServerInstance->next_call = ServerInstance->Time() + ServerInstance->Config->dns_timeout;
FOREACH_MOD(I_OnUserRegister,OnUserRegister(user));
}