[asterisk-commits] russell: trunk r106896 - in /trunk: ./ apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Mar  7 16:52:46 2008
New Revision: 106896

URL: http://svn.digium.com/view/asterisk?view=rev&rev=106896
Log:
Merged revisions 106895 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r106895 | russell | 2008-03-07 16:51:23 -0600 (Fri, 07 Mar 2008) | 2 lines

Only start the SLA thread if SLA has actually been configured.

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_meetme.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_meetme.c?view=diff&rev=106896&r1=106895&r2=106896
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Fri Mar  7 16:52:46 2008
@@ -5510,7 +5510,7 @@
 
 	ast_config_destroy(cfg);
 
-	if (!reload)
+	if (!reload && (!AST_LIST_EMPTY(&sla_stations) || !AST_LIST_EMPTY(&sla_stations)))
 		ast_pthread_create(&sla.thread, NULL, sla_thread, NULL);
 
 	return res;