[svn-commits] file: branch 13 r423255 - in /branches/13: ./ res/res_rtp_asterisk.c

[SVN commits to the Digium repositories]

Author: file
Date: Wed Sep 17 13:05:21 2014
New Revision: 423255

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=423255
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
........

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

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

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

Modified: branches/13/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/branches/13/res/res_rtp_asterisk.c?view=diff&rev=423255&r1=423254&r2=423255
==============================================================================
--- branches/13/res/res_rtp_asterisk.c (original)
+++ branches/13/res/res_rtp_asterisk.c Wed Sep 17 13:05:21 2014
@@ -5269,6 +5269,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);