BUILD : 1.7.6 (453) BUGS : 224 NOTES : Removing Sqline on bot nicks change if the nick was registered

git-svn-id: svn://svn.anope.org/anope/trunk@453 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@307 5417fbe8-f217-4b02-8779-1006273d7864

3 files changed, 12 insertions, 7 deletions

diff --git a/Changes b/Changes
index 739f5abf7..27f108df4 100644
--- a/Changes
+++ b/Changes
@@ -7,6 +7,7 @@ Provided by Anope Dev. <dev@anope.org> - 2004
 
 Provided by Trystan <trystan@nomadirc.net> - 2004
 11/19 A Added anope_cmd_ctcp() to code API, for sending CTCP messages	  [ #00]
+11/20 F Removing Sqline on bot nicks change if the nick was registered	  [#224]
 11/19 F normalizeBuffer() now strips control character 1		  [ #00]
 11/19 F CTCP Ping replies when UsePrivmsg is enabled			  [ #00]
 11/19 F Some config options could overflow strtol()			  [ #00] 
diff --git a/src/botserv.c b/src/botserv.c
index 25986b566..0c23c4c68 100644
--- a/src/botserv.c
+++ b/src/botserv.c
@@ -1365,12 +1365,6 @@ static int do_bot(User * u)
             }
 
             if (stricmp(bi->nick, nick)) {
-                /* The new nick is really different, so we remove the Q line for
-                   the old nick. */
-                if (ircd->sqline) {
-                    anope_cmd_unsqline(bi->nick);
-                }
-
                 /* We check whether the nick is registered, and inform the user
                  * if so. You need to drop the nick manually before you can use
                  * it as a bot nick from now on -GD
@@ -1381,6 +1375,12 @@ static int do_bot(User * u)
                     return MOD_CONT;
                 }
 
+                /* The new nick is really different, so we remove the Q line for
+                   the old nick. */
+                if (ircd->sqline) {
+                    anope_cmd_unsqline(bi->nick);
+                }
+
                 /* We check whether user with this nick is online, and kill it if so */
                 EnforceQlinedNick(nick, s_BotServ);
             }
diff --git a/version.log b/version.log
index ab79baa33..8d0b85e2d 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
 VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="6"
-VERSION_BUILD="452"
+VERSION_BUILD="453"
 
 # $Log$
 #
+# BUILD : 1.7.6 (453)
+# BUGS  : 224
+# NOTES : Removing Sqline on bot nicks change if the nick was registered
+#
 # BUILD : 1.7.6 (452)
 # BUGS  : N/A
 # NOTES : 1. Fixed some config options could overflow strtol(), 2. Fixed CTCP Ping replies when UsePrivmsg is enabled