[svn-commits] twilson: branch 1.6.2 r272149 - in /branches/1.6.2: ./ apps/app_meetme.c

[SVN commits to the Digium repositories]

Author: twilson
Date: Wed Jun 23 13:41:35 2010
New Revision: 272149

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=272149
Log:
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
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/apps/app_meetme.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/apps/app_meetme.c?view=diff&rev=272149&r1=272148&r2=272149
==============================================================================
--- branches/1.6.2/apps/app_meetme.c (original)
+++ branches/1.6.2/apps/app_meetme.c Wed Jun 23 13:41:35 2010
@@ -6355,7 +6355,7 @@
 
 	/* 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 @@
 {
 	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");