Merged revisions 64306 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r64306 | russell | 2007-05-14 14:13:00 -0500 (Mon, 14 May 2007) | 3 lines

Properly handle AST_CONTROL_PROGRESS by just ignoring it.  An unknown indication
will trigger an error and cause sounds to stop, which in this case, is ringing.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@64322 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index aa444c5db407b63ff921505f5b97eaaf81370d98..feed79e04e6c9d7bdd5905568253d25cc07c48c8 100644 (file)
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -758,6 +758,7 @@ static int alsa_indicate(struct ast_channel *chan, int cond, const void *data, s
                        res = 2;
                        break;
                case AST_CONTROL_RINGING:
+               case AST_CONTROL_PROGRESS:
                        break;
                case -1:
                        res = -1;