diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-08 01:43:16 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-08 01:43:16 +0000 |
| commit | a626c32f9e41b17ca1001a81435a33efb9ecfcce (patch) | |
| tree | dc6a61678dd346de436915e1f66a41483497fa68 /channels/chan_console.c | |
| parent | ab6008baa0cf5f89aadcb4c0f6b80ca75d635088 (diff) | |
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.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@121164 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_console.c')
| -rw-r--r-- | channels/chan_console.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_console.c b/channels/chan_console.c index 7d62e6235..7911b55b3 100644 --- a/channels/chan_console.c +++ b/channels/chan_console.c @@ -391,7 +391,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); |