summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Peeler <jpeeler@digium.com>2008-06-08 01:41:59 +0000
committerJeff Peeler <jpeeler@digium.com>2008-06-08 01:41:59 +0000
commit33b3d38a3cdc5dd7233c5803a863acc466f87624 (patch)
tree2bb5c981a664ab44a87e3a01f4059c95fd5f8ee5
parentc1b88b3cf45525d5e99540f64767b907b9c11598 (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: https://origsvn.digium.com/svn/asterisk/trunk@121163 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-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);