diff options
| author | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-11-29 23:05:45 +0000 |
|---|---|---|
| committer | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-11-29 23:05:45 +0000 |
| commit | 10e1d9292451416ddaccbb81b521823f785ef12b (patch) | |
| tree | 004041a6b07b44e5bfafee739b5bab38e459df19 /channels | |
| parent | 4b0b333c73c875750fe13222e84142d5a7077fdb (diff) | |
Merged revisions 296671 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r296671 | pabelanger | 2010-11-29 17:54:14 -0500 (Mon, 29 Nov 2010) | 12 lines
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.8@296673 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_iax2.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index c21c18246..813d17794 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -14218,8 +14218,6 @@ static int __unload_module(void) cleanup_thread_list(&active_list); cleanup_thread_list(&dynamic_list); - sched = ast_sched_thread_destroy(sched); - ast_netsock_release(netsock); ast_netsock_release(outsock); for (x = 0; x < ARRAY_LEN(iaxs); x++) { @@ -14261,6 +14259,7 @@ static int __unload_module(void) ast_timer_close(timer); } transmit_processor = ast_taskprocessor_unreference(transmit_processor); + sched = ast_sched_thread_destroy(sched); con = ast_context_find(regcontext); if (con) |