mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-19 00:00:09 +00:00
Rolling back change until kpfleming is comfy
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@22113 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1057,9 +1057,6 @@ void ast_channel_spy_remove(struct ast_channel *chan, struct ast_channel_spy *sp
|
|||||||
ast_frfree(f);
|
ast_frfree(f);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Release all threads waiting on this trigger prior to destroying it */
|
|
||||||
ast_cond_broadcast(&spy->trigger);
|
|
||||||
|
|
||||||
if (ast_test_flag(spy, CHANSPY_TRIGGER_MODE) != CHANSPY_TRIGGER_NONE)
|
if (ast_test_flag(spy, CHANSPY_TRIGGER_MODE) != CHANSPY_TRIGGER_NONE)
|
||||||
ast_cond_destroy(&spy->trigger);
|
ast_cond_destroy(&spy->trigger);
|
||||||
|
|
||||||
@@ -1091,7 +1088,7 @@ static void detach_spies(struct ast_channel *chan)
|
|||||||
if (spy->status == CHANSPY_RUNNING)
|
if (spy->status == CHANSPY_RUNNING)
|
||||||
spy->status = CHANSPY_DONE;
|
spy->status = CHANSPY_DONE;
|
||||||
if (ast_test_flag(spy, CHANSPY_TRIGGER_MODE) != CHANSPY_TRIGGER_NONE)
|
if (ast_test_flag(spy, CHANSPY_TRIGGER_MODE) != CHANSPY_TRIGGER_NONE)
|
||||||
ast_cond_broadcast(&spy->trigger);
|
ast_cond_signal(&spy->trigger);
|
||||||
ast_mutex_unlock(&spy->lock);
|
ast_mutex_unlock(&spy->lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user