From 2bcef29e110b196e0255d1975b008167d29b9987 Mon Sep 17 00:00:00 2001 From: Terry Wilson Date: Wed, 23 Jun 2010 18:39:20 +0000 Subject: Don't start the sla thread unless we realy need it git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@272146 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_meetme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apps/app_meetme.c') diff --git a/apps/app_meetme.c b/apps/app_meetme.c index bcd2be476..f632bef5c 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -6615,7 +6615,7 @@ static int sla_load_config(int reload) /* Even if we don't have any stations, we may after a reload and we need to * be able to process the SLA_EVENT_RELOAD event in that case */ - if (!reload) { + if (sla.thread == AST_PTHREADT_NULL && (!AST_LIST_EMPTY(&sla_stations) || !AST_LIST_EMPTY(&sla_trunks))) { ast_pthread_create(&sla.thread, NULL, sla_thread, NULL); } @@ -6701,7 +6701,7 @@ static int load_config(int reload) { load_config_meetme(); - if (reload) { + if (reload && sla.thread != AST_PTHREADT_NULL) { sla_queue_event(SLA_EVENT_RELOAD); ast_log(LOG_NOTICE, "A reload of the SLA configuration has been requested " "and will be completed when the system is idle.\n"); -- cgit v1.2.3