diff options
| author | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-23 18:41:35 +0000 |
|---|---|---|
| committer | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-23 18:41:35 +0000 |
| commit | e540f6cadc45d9e1697a64f38936a65328c9605f (patch) | |
| tree | ff3eb667ce62535fd3f273383f276a6d276e49f3 /apps/app_meetme.c | |
| parent | 0dc712a3a165bc0734178cb915dc8d3911464598 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@272149 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index edaf428a4..4990b899f 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"); |