diff options
| author | Joshua Colp <jcolp@digium.com> | 2008-02-27 15:58:28 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2008-02-27 15:58:28 +0000 |
| commit | 71e0880478d972475669b366595d1f8f64a1132a (patch) | |
| tree | a0bc576c15a6c8764ba5368244e2dd844e07c6fd /res/res_smdi.c | |
| parent | f696089089a51621903a6ce9696acdd6bbe007cf (diff) | |
Merged revisions 104536 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r104536 | file | 2008-02-27 11:52:02 -0400 (Wed, 27 Feb 2008) | 4 lines
Only stop the MWI monitor thread if it was actually started.
(closes issue #12086)
Reported by: francesco_r
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@104537 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_smdi.c')
| -rw-r--r-- | res/res_smdi.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/res/res_smdi.c b/res/res_smdi.c index 3a8a5f4d6..bd3170ee8 100644 --- a/res/res_smdi.c +++ b/res/res_smdi.c @@ -1274,7 +1274,9 @@ static int unload_module(void) ast_cond_signal(&mwi_monitor.cond); ast_mutex_unlock(&mwi_monitor.lock); - pthread_join(mwi_monitor.thread, NULL); + if (mwi_monitor.thread != AST_PTHREADT_NULL) { + pthread_join(mwi_monitor.thread, NULL); + } ast_custom_function_unregister(&smdi_msg_retrieve_function); ast_custom_function_unregister(&smdi_msg_function); |