From: Joshua Colp <jcolp@digium.com>
Date: Wed, 17 Sep 2014 18:06:06 +0000 (+0000)
Subject: res_rtp_asterisk: Ensure that the thread terminating pj stuff is registered.
X-Git-Tag: 14.0.0-beta1~1655
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8839ba3727cf55018cfeae5ff7ce7d4d758993a2;p=thirdparty%2Fasterisk.git

res_rtp_asterisk: Ensure that the thread terminating pj stuff is registered.
........

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
---

diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c
index dc5a2a71e4..5cb67e6f05 100644
--- a/res/res_rtp_asterisk.c
+++ b/res/res_rtp_asterisk.c
@@ -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);