Просмотр исходного кода

Merge branch 'botcmd-unknown-group' into next

* botcmd-unknown-group:
  Fix no bots found when group passed in

Conflicts:
	doc/UPDATES
Bryan Drewery 13 лет назад
Родитель
Сommit
9fe105a68d
2 измененных файлов с 7 добавлено и 2 удалено
  1. 1 0
      doc/UPDATES
  2. 6 2
      src/cmds.c

+ 1 - 0
doc/UPDATES

@@ -4,6 +4,7 @@ next
   * Fix LASTON not being shared
   * Fix cmd_hublevel not properly requiring a hublevel argument
   * Fix cmd_slowjoin eating the first channel option (This fixes groups support)
+  * Fix 'bl %group cmd' giving incorrect message when group/bots not found.
 
 1.4.3
   * Default 'set promisc' to ignore since it's usually a false positive

+ 6 - 2
src/cmds.c

@@ -1500,8 +1500,12 @@ static void cmd_botcmd(int idx, char *par)
     check_bind_dcc(cmd, idx, par);
   }
 
-  if (!found)
-    dprintf(idx, "No bot matching '%s' linked\n", botm);
+  if (!found) {
+    if (group)
+      dprintf(idx, "No linked bots found in group '%s'\n", group);
+    else
+      dprintf(idx, "No bot matching '%s' linked\n", botm);
+  }
 
   return;
 }