kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 02:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
........

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

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@423255 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2014-09-17 18:05:21 +00:00
parent 85d7e44186
commit c48b609fb3
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/res_rtp_asterisk.c
View File

@@ -5269,6 +5269,8 @@ static int reload_module(void)
#ifdef HAVE_PJPROJECT #ifdef HAVE_PJPROJECT
static void rtp_terminate_pjproject(void) static void rtp_terminate_pjproject(void)
{ {
pj_thread_register_check();
if (timer_thread) { if (timer_thread) {
timer_terminate = 1; timer_terminate = 1;
pj_thread_join(timer_thread); pj_thread_join(timer_thread);