[asterisk-commits] file: branch 12 r423254 - in /branches/12: ./ res/res_rtp_asterisk.c

[SVN commits to the Asterisk project]

Author: file
Date: Wed Sep 17 13:04:25 2014
New Revision: 423254

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=423254
Log:
res_rtp_asterisk: Ensure that the thread terminating pj stuff is registered.
........

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

Modified:
    branches/12/   (props changed)
    branches/12/res/res_rtp_asterisk.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/res/res_rtp_asterisk.c?view=diff&rev=423254&r1=423253&r2=423254
==============================================================================
--- branches/12/res/res_rtp_asterisk.c (original)
+++ branches/12/res/res_rtp_asterisk.c Wed Sep 17 13:04:25 2014
@@ -5239,6 +5239,8 @@
 #ifdef HAVE_PJPROJECT
 static void rtp_terminate_pjproject(void)
 {
+	pj_thread_register_check();
+
 	if (timer_thread) {
 		timer_terminate = 1;
 		pj_thread_join(timer_thread);