From b7f244d082ab5512f1d0add63a6344fce27db4b4 Mon Sep 17 00:00:00 2001 From: russell Date: Fri, 7 Mar 2008 22:53:06 +0000 Subject: 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. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@106897 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_meetme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apps') diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 41c995009..a9ffb196d 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -5510,7 +5510,7 @@ static int sla_load_config(int reload) 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; -- cgit v1.2.3