res_rtp_asterisk: Ensure that the thread terminating pj stuff is registered.
authorJoshua Colp <jcolp@digium.com>
Wed, 17 Sep 2014 18:06:06 +0000 (18:06 +0000)
committerJoshua Colp <jcolp@digium.com>
Wed, 17 Sep 2014 18:06:06 +0000 (18:06 +0000)
........

Merged revisions 423253 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 423254 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 423255 from http://svn.asterisk.org/svn/asterisk/branches/13

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@423256 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_rtp_asterisk.c

index dc5a2a7..5cb67e6 100644 (file)
@@ -5269,6 +5269,8 @@ static int reload_module(void)
 #ifdef HAVE_PJPROJECT
 static void rtp_terminate_pjproject(void)
 {
+       pj_thread_register_check();
+
        if (timer_thread) {
                timer_terminate = 1;
                pj_thread_join(timer_thread);