[svn-commits] file: trunk r104537 - in /trunk: ./ res/res_smdi.c

[SVN commits to the Digium repositories]

Author: file
Date: Wed Feb 27 09:58:28 2008
New Revision: 104537

URL: http://svn.digium.com/view/asterisk?view=rev&rev=104537
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/res/res_smdi.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/res/res_smdi.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_smdi.c?view=diff&rev=104537&r1=104536&r2=104537
==============================================================================
--- trunk/res/res_smdi.c (original)
+++ trunk/res/res_smdi.c Wed Feb 27 09:58:28 2008
@@ -1274,7 +1274,9 @@
 	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);