X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fchanserv.c;h=2d3669684e9c5cb3196ab10dc0e3694a842fd450;hb=0a502ddd052402696675851a282f81052dc59b87;hp=8bdad625b8f63bec3d3224049d6a7917ae0db7ad;hpb=3c70e89e7cc738f30cfbd1a5530507af41fc9ed6;p=srvx.git

diff --git a/src/chanserv.c b/src/chanserv.c
index 8bdad62..2d36696 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -1362,7 +1362,7 @@ unregister_channel(struct chanData *channel, const char *reason)
 }
 
 static void
-expire_channels(UNUSED_ARG(void *data))
+expire_channels(void *data)
 {
     struct chanData *channel, *next;
     struct userData *user;
@@ -1392,7 +1392,7 @@ expire_channels(UNUSED_ARG(void *data))
         unregister_channel(channel, "registration expired.");
     }
 
-    if(chanserv_conf.channel_expire_frequency)
+    if(chanserv_conf.channel_expire_frequency && !data)
         timeq_add(now + chanserv_conf.channel_expire_frequency, expire_channels, NULL);
 }
 
@@ -4906,7 +4906,7 @@ chanserv_support_channels(void)
 static CHANSERV_FUNC(cmd_expire)
 {
     int channel_count = registered_channels;
-    expire_channels(NULL);
+    expire_channels(chanserv);
     reply("CSMSG_CHANNELS_EXPIRED", channel_count - registered_channels);
     return 1;
 }