X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Feventclient%2Fserv_eventclient.c;h=dd3c4d403bb1fc1c8f66d7b4199d2323e38fcd31;hb=cdc34fa661ed54fdcebf86521496220cc28f4943;hp=eb3f97d1dc84efabfd0cee18485a3bee25e7712c;hpb=5bf6670f304602919abae191ba88232d693de1ff;p=citadel.git

diff --git a/citadel/modules/eventclient/serv_eventclient.c b/citadel/modules/eventclient/serv_eventclient.c
index eb3f97d1d..dd3c4d403 100644
--- a/citadel/modules/eventclient/serv_eventclient.c
+++ b/citadel/modules/eventclient/serv_eventclient.c
@@ -622,7 +622,9 @@ void InitEventQueue(void)
 	InboundEventQueues[1] = NewHash(1, Flathash);
 	InboundEventQueue = InboundEventQueues[0];
 }
+extern void CtdlDestroyEVCleanupHooks(void);
 
+extern int EVQShutDown;
 /*
  * this thread operates the select() etc. via libev.
  */
@@ -659,6 +661,9 @@ void *client_event_thread(void *arg)
 	close(event_add_pipe[0]);
 	close(event_add_pipe[1]);
 
+	CtdlDestroyEVCleanupHooks();
+
+	EVQShutDown = 1;	
 	return(NULL);
 }
 
@@ -805,7 +810,6 @@ CTDL_MODULE_INIT(event_client)
 {
 	if (!threading)
 	{
-		CtdlRegisterCleanupHook(ShutDownEventQueues);
 		InitEventQueue();
 		DBInitEventQueue();
 		CtdlThreadCreate(client_event_thread);