diff options
| author | Joshua Colp <jcolp@digium.com> | 2014-09-17 18:05:21 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2014-09-17 18:05:21 +0000 |
| commit | c48b609fb3e2da71ada2ec883334a77e089f3b8f (patch) | |
| tree | 6e85f5f909ec63bb553ca976e550457720520dcc /res/res_rtp_asterisk.c | |
| parent | 85d7e441863f09edd3cc54a241e6cb272f8d91ce (diff) | |
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
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@423255 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_rtp_asterisk.c')
| -rw-r--r-- | res/res_rtp_asterisk.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c index dc5a2a71e..5cb67e6f0 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); |