]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Only stop the MWI monitor thread if it was actually started.
authorJoshua Colp <jcolp@digium.com>
Wed, 27 Feb 2008 15:52:02 +0000 (15:52 +0000)
committerJoshua Colp <jcolp@digium.com>
Wed, 27 Feb 2008 15:52:02 +0000 (15:52 +0000)
(closes issue #12086)
Reported by: francesco_r

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@104536 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_smdi.c

index 87a4dd49d27c93259c05d583c532b684a3ae7193..9315cf973241968ba2686e087200a9741c6e0409 100644 (file)
@@ -1281,7 +1281,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);