mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-06 01:45:11 +00:00
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. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114889 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user