aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2008-06-08 01:41:59 +0000
committerjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2008-06-08 01:41:59 +0000
commitd6ba625aacca59756289d2b2edbfbdea1ca48613 (patch)
tree2bb5c981a664ab44a87e3a01f4059c95fd5f8ee5
parent592ef84d247f6aef8fd481094664b0c24ed2946d (diff)
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. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@121163 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_console.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_console.c b/channels/chan_console.c
index 4ad5e793c..10f77fdc7 100644
--- a/channels/chan_console.c
+++ b/channels/chan_console.c
@@ -393,7 +393,7 @@ return_unlock:
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);