]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
res_rtp_asterisk: Ensure that the thread terminating pj stuff is registered.
authorJoshua Colp <jcolp@digium.com>
Wed, 17 Sep 2014 18:04:25 +0000 (18:04 +0000)
committerJoshua Colp <jcolp@digium.com>
Wed, 17 Sep 2014 18:04:25 +0000 (18:04 +0000)
........

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

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

res/res_rtp_asterisk.c

index 0e99a8a600b763c123408d2c96092385d4ca83c0..46e9c737c09b878d643af5826dff39e4dbccfef0 100644 (file)
@@ -5239,6 +5239,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);