[svn-commits] russell: branch 1.6.0 r106897 - in /branches/1.6.0: ./ apps/app_meetme.c

[SVN commits to the Digium repositories]

Author: russell
Date: Fri Mar  7 16:53:06 2008
New Revision: 106897

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

................
r106896 | russell | 2008-03-07 16:52:46 -0600 (Fri, 07 Mar 2008) | 10 lines

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:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_meetme.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Fri Mar  7 16:53:06 2008
@@ -1,1 +1,1 @@
-/trunk:1-105595,105675,105677,105733-105734,105773,105785,105804,105840-105841,105864,105899,105933,106036,106040,106139,106186,106238-106239,106329,106346,106399,106438-106439,106501,106507,106518,106553,106607,106654,106684,106707,106789
+/trunk:1-105595,105675,105677,105733-105734,105773,105785,105804,105840-105841,105864,105899,105933,106036,106040,106139,106186,106238-106239,106329,106346,106399,106438-106439,106501,106507,106518,106553,106607,106654,106684,106707,106789,106896

Modified: branches/1.6.0/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_meetme.c?view=diff&rev=106897&r1=106896&r2=106897
==============================================================================
--- branches/1.6.0/apps/app_meetme.c (original)
+++ branches/1.6.0/apps/app_meetme.c Fri Mar  7 16:53:06 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;