X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fglobal.c;h=cd6a43c1b081ce4a9a6f0470eeec267cdcc7aee6;hb=9c6be56bf819c624f8e7b0a0ebbe77fe14cb3e0f;hp=575dac2b0c97711b2276b3c11dd98041d125610d;hpb=2327a38fc4bffb47ec3ac067264b061476487861;p=srvx.git

diff --git a/src/global.c b/src/global.c
index 575dac2..cd6a43c 100644
--- a/src/global.c
+++ b/src/global.c
@@ -591,7 +591,7 @@ global_conf_read(void)
     global_conf.announcements_default = str ? enabled_string(str) : 1;
 
     str = database_get_data(conf_node, KEY_NICK, RECDB_QSTRING);
-    if(str)
+    if(global && str)
         NickChange(global, str, 0);
 }
 
@@ -653,13 +653,13 @@ global_saxdb_write(struct saxdb_context *ctx)
 static void
 global_db_cleanup(void)
 {
-    while (messageList) message_del(messageList);
+    while(messageList)
+        message_del(messageList);
 }
 
 void
 init_global(const char *nick)
 {
-    global = AddService(nick, "Global Services");
     G_LOG = log_register_type("Global", "file:global.log");
     reg_new_user_func(global_process_user);
     reg_auth_func(global_process_auth);
@@ -674,7 +674,11 @@ init_global(const char *nick)
     modcmd_register(global_module, "NOTICE", cmd_notice, 3, MODCMD_REQUIRE_AUTHED, "flags", "+oper", NULL);
     modcmd_register(global_module, "REMOVE", cmd_remove, 2, MODCMD_REQUIRE_AUTHED, "flags", "+oper", NULL);
 
-    global_service = service_register(global, 0);
+    if(nick)
+    {
+        global = AddService(nick, "Global Services");
+        global_service = service_register(global, 0);
+    }
     saxdb_register("Global", global_saxdb_read, global_saxdb_write);
     reg_exit_func(global_db_cleanup);
     message_register_table(msgtab);