[asterisk-commits] jpeeler: branch 1.6.0 r114889 - in /branches/1.6.0: ./ channels/chan_console.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Wed Apr 30 11:15:36 2008
New Revision: 114889

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114889
Log:
Merged revisions 114888 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r114888 | jpeeler | 2008-04-30 11:14:43 -0500 (Wed, 30 Apr 2008) | 3 lines

Fixes a bug where if a stream monitor thread was not created (caused from failure of opening or starting the stream) pthread_cancel was called with an invalid thread ID.


........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_console.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_console.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_console.c?view=diff&rev=114889&r1=114888&r2=114889
==============================================================================
--- branches/1.6.0/channels/chan_console.c (original)
+++ branches/1.6.0/channels/chan_console.c Wed Apr 30 11:15:36 2008
@@ -391,7 +391,7 @@
 
 static int stop_stream(struct console_pvt *pvt)
 {
-	if (!pvt->streamstate)
+	if (!pvt->streamstate || pvt->thread == AST_PTHREADT_NULL)
 		return 0;
 
 	pthread_cancel(pvt->thread);