diff options
author | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-11-29 22:54:14 +0000 |
---|---|---|
committer | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-11-29 22:54:14 +0000 |
commit | 6719127ff582937f4c3e55cb245aae1921143657 (patch) | |
tree | 22a21830dcaf3ddd64600cced7622b7852d8a8df /channels | |
parent | e895a233fb5ef5b99c69f1d79b5f785194501492 (diff) |
Merged revisions 296670 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r296670 | pabelanger | 2010-11-29 17:49:39 -0500 (Mon, 29 Nov 2010) | 5 lines
Make sure nothing else is needed before destroying the scheduler.
(closes issue #18398)
Reported by: pabelanger
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@296671 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_iax2.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index bcc8b39f3..f6b2a4232 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -13697,14 +13697,12 @@ static int __unload_module(void) iax2_destroy(x); } } - + /* Call for all threads to halt */ cleanup_thread_list(&idle_list); cleanup_thread_list(&active_list); cleanup_thread_list(&dynamic_list); - sched = ast_sched_thread_destroy(sched); - ast_netsock_release(netsock); ast_netsock_release(outsock); @@ -13728,6 +13726,7 @@ static int __unload_module(void) if (timer) { ast_timer_close(timer); } + sched = ast_sched_thread_destroy(sched); con = ast_context_find(regcontext); if (con) |