register only to active bots - even if the register priority of inactive ones is...

diff --git a/src/cmd_global_register.c b/src/cmd_global_register.c
index ab467d979b87dde8fc24f7fba8b184f696c5960c..a0c42587defee4804b438b5b4a046589908ec615 100644 (file)
--- a/src/cmd_global_register.c
+++ b/src/cmd_global_register.c
@@ -209,7 +209,7 @@ static void global_cmd_register_async1(struct ClientSocket *client, struct Clien
             userid = (int) mysql_insert_id(mysql_conn);
         }
     }
-    printf_mysql_query("SELECT `id`, `max_channels`, `defaulttrigger`, `nick` FROM `bots` WHERE `botclass` = '%d' ORDER BY `register_priority` DESC", client->botid);
+    printf_mysql_query("SELECT `id`, `max_channels`, `defaulttrigger`, `nick` FROM `bots` WHERE `botclass` = '%d' AND `active` = '1' ORDER BY `register_priority` DESC", client->botid);
     res = mysql_use();
     int botid = 0;
     char *bottrigger;
@@ -245,7 +245,7 @@ static void global_cmd_register_async1(struct ClientSocket *client, struct Clien
     if(bot) {
         putsock(bot, "JOIN %s", channel);
     } else
-        reply(textclient, user, "NS_REGISTER_DISCONNECTED");
+        reply(textclient, user, "NS_REGISTER_DISCONNECTED", channel);
     printf_mysql_query("INSERT INTO `bot_channels` (`botid`, `chanid`, `trigger`) VALUES ('%d', '%d', '%s')", botid, chanid, bottrigger);
     if(multibot != 2) {
         if(multibot) {