From: Paul Belanger <paul.belanger@polybeacon.com>
Date: Mon, 29 Nov 2010 22:54:14 +0000 (+0000)
Subject: Merged revisions 296670 via svnmerge from
X-Git-Tag: 1.6.2.16-rc1~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7553cd7e05a582ff9756feed80aa75ff0103f0f5;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@296671 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index bcc8b39f3a..f6b2a42322 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)