diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-24 19:42:33 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-24 19:42:33 +0000 |
| commit | 054584618c372491f8e7fddc83a7f00a4a1f5f78 (patch) | |
| tree | 6c65503be458c785948958d8af5950b69415fb3e /apps | |
| parent | a02b71dd1281e55e76b4e3ac5c1d7899346fa27f (diff) | |
Merged revisions 220289 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r220289 | tilghman | 2009-09-24 14:41:02 -0500 (Thu, 24 Sep 2009) | 13 lines
Merged revisions 220288 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r220288 | tilghman | 2009-09-24 14:39:41 -0500 (Thu, 24 Sep 2009) | 6 lines
Implicitly sending a progress signal breaks some applications.
Call Progress() in your dialplan if you explicitly want progress to be sent.
(Reverts change 216430, closes issue #15957)
Reported by: Pavel Troller on the Asterisk-Dev mailing list
http://lists.digium.com/pipermail/asterisk-dev/2009-September/039897.html
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@220291 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_disa.c | 7 | ||||
| -rw-r--r-- | apps/app_playback.c | 3 |
2 files changed, 1 insertions, 9 deletions
diff --git a/apps/app_disa.c b/apps/app_disa.c index d93bb1485..6ced33b1c 100644 --- a/apps/app_disa.c +++ b/apps/app_disa.c @@ -160,12 +160,7 @@ static int disa_exec(struct ast_channel *chan, void *data) /* answer */ ast_answer(chan); } - } else { - special_noanswer = 1; - if (chan->_state != AST_STATE_UP) { - ast_indicate(chan, AST_CONTROL_PROGRESS); - } - } + } else special_noanswer = 1; ast_debug(1, "Context: %s\n",args.context); diff --git a/apps/app_playback.c b/apps/app_playback.c index 0be2c2e48..2dc3c5b17 100644 --- a/apps/app_playback.c +++ b/apps/app_playback.c @@ -429,10 +429,7 @@ static int playback_exec(struct ast_channel *chan, void *data) } else if (!option_noanswer) { /* Otherwise answer unless we're supposed to send this while on-hook */ res = ast_answer(chan); - } else { - ast_indicate(chan, AST_CONTROL_PROGRESS); } - } if (!res) { char *back = args.filenames; |