From: Terry Wilson <twilson@digium.com>
Date: Wed, 23 Jun 2010 18:41:35 +0000 (+0000)
Subject: Merged revisions 272146 via svnmerge from
X-Git-Tag: 1.6.2.10-rc1~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84c6f9c7505b6b1ac12003a73dc633008976c0ac;p=thirdparty%2Fasterisk.git

Merged revisions 272146 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r272146 | twilson | 2010-06-23 13:39:20 -0500 (Wed, 23 Jun 2010) | 2 lines

  Don't start the sla thread unless we realy need it
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@272149 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index edaf428a46..4990b899fb 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -6355,7 +6355,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);
 	}
 
@@ -6450,7 +6450,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");