From aff63fba76743bc0ad9c90e6753334142edca06b Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Mon, 14 May 2007 17:23:51 +0000 Subject: [PATCH] Fix scenario where if a phone that simply called Echo() put itself on hold it could never get off hold. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@64240 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/channel.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/main/channel.c b/main/channel.c index f7e0df9b04..093296b31e 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2726,8 +2726,11 @@ int ast_write(struct ast_channel *chan, struct ast_frame *fr) res = ast_senddigit_end(chan, fr->subclass, fr->len); ast_channel_lock(chan); CHECK_BLOCKING(chan); + } else if (fr->frametype == AST_FRAME_CONTROL && fr->subclass == AST_CONTROL_UNHOLD) { + /* This is a side case where Echo is basically being called and the person put themselves on hold and took themselves off hold */ + res = (chan->tech->indicate == NULL) ? 0 : + chan->tech->indicate(chan, fr->subclass, fr->data, fr->datalen); } - res = 0; /* XXX explain, why 0 ? */ goto done; }