[svn-commits] jpeeler: branch 1.6.0 r121164 - in /branches/1.6.0: ./ channels/chan_console.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Sat Jun  7 20:43:16 2008
New Revision: 121164

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

........
r121163 | jpeeler | 2008-06-07 20:41:59 -0500 (Sat, 07 Jun 2008) | 4 lines

This was accidentally reverted.
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=121164&r1=121163&r2=121164
==============================================================================
--- branches/1.6.0/channels/chan_console.c (original)
+++ branches/1.6.0/channels/chan_console.c Sat Jun  7 20:43:16 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);