Merge.

[irc/quakenet/newserv.git] / noperserv / noperserv_hooks.c

diff --git a/noperserv/noperserv_hooks.c b/noperserv/noperserv_hooks.c
index e51b815827f87889ab39130fbf80048390ccb5f2..071b172f7ceeb1296f72834825394b382bcced11 100644 (file)
--- a/noperserv/noperserv_hooks.c
+++ b/noperserv/noperserv_hooks.c
@@ -135,7 +135,7 @@ void noperserv_cleanup_hooks(void) {
     firsttime = 0;
   }
 
-  if(oldhandler)
+  if(oldhandler && mynick)
     hooklocaluserhandler(mynick, oldhandler);
 
   controlwall = oldwall;
@@ -143,6 +143,10 @@ void noperserv_cleanup_hooks(void) {
 }
 
 void noperserv_trap_registration(int hooknum, void *arg) {
+  nick *np = (nick *)arg;
+  if(!np)
+    return;
+
   oldhandler = hooklocaluserhandler((nick *)arg, &noperserv_handle_messages);
   if(!oldhandler)
     return;