[asterisk-commits] file: trunk r64242 - in /trunk: ./ main/channel.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Mon May 14 12:25:25 2007
New Revision: 64242

URL: http://svn.digium.com/view/asterisk?view=rev&rev=64242
Log:
Merged revisions 64240 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r64240 | file | 2007-05-14 13:23:51 -0400 (Mon, 14 May 2007) | 2 lines

Fix scenario where if a phone that simply called Echo() put itself on hold it could never get off hold.

........

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?view=diff&rev=64242&r1=64241&r2=64242
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Mon May 14 12:25:25 2007
@@ -2686,8 +2686,11 @@
 				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;
 		}