nickwatch: Fix lostnick hook.

diff --git a/newsearch/newsearch.c b/newsearch/newsearch.c
index ccde9c57b2670c7f10e18adaa10a9f7df5a5d19f..c8500f28c5f74cbdf912475ff76e029e095feab0 100644 (file)
--- a/newsearch/newsearch.c
+++ b/newsearch/newsearch.c
@@ -538,7 +538,7 @@ void nicksearch_exe(struct searchNode *search, searchCtx *ctx) {
       if (ctx->targets) {
         np = ((nick **)ctx->targets->content)[k];
         if (!np)
-          break;
+          continue;
       }
 
       if ((search->exe)(ctx, search, np)) {

diff --git a/nickwatch/nickwatch.c b/nickwatch/nickwatch.c
index d1895d311039b52b426f20cbac6ec32730a81f43..a82ca230b6a7fadd9470232aaaf1b2ba36bbb443 100644 (file)
--- a/nickwatch/nickwatch.c
+++ b/nickwatch/nickwatch.c
@@ -118,11 +118,9 @@ static void nw_hook_lostnick(int hooknum, void *arg) {
 
   nwe_clear(np);
 
-  for (i = 0; i < nw_pendingnicks.cursi;)
+  for (i = 0; i < nw_pendingnicks.cursi; i++)
     if (((nick **)nw_pendingnicks.content)[i] == np)
-      array_delslot(&nw_pendingnicks, i);
-    else
-      i++;
+      ((nick **)nw_pendingnicks.content)[i] = NULL;
 }
 
 static void nw_hook_rename(int hooknum, void *arg) {