From 71e0880478d972475669b366595d1f8f64a1132a Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Wed, 27 Feb 2008 15:58:28 +0000 Subject: [PATCH] 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 --- res/res_smdi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/res/res_smdi.c b/res/res_smdi.c index 3a8a5f4d6b..bd3170ee84 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);