From 494d7f7489a78df919c1e9effcb0a014e8dc2286 Mon Sep 17 00:00:00 2001
From: brain
Date: Sat, 28 Oct 2006 19:42:29 +0000
Subject: * 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
---
 src/cmd_nick.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/cmd_nick.cpp')

diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index 2008e8e11..38ca0c7e3 100644
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -138,8 +138,8 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 			if (user->dns_done)
 				ServerInstance->Log(DEBUG,"Aborting dns lookup of %s because dns server experienced a failure.",user->nick);
 		}
-
-		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;
 	}
 	if (user->registered == REG_NICKUSER)
 	{
-- 
cgit v1.3.1-10-gc9f91