From: Terry Wilson Date: Thu, 25 Mar 2010 16:19:13 +0000 (+0000) Subject: Merged revisions 254453 via svnmerge from X-Git-Tag: 1.6.0.27-rc1~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=299146ba898c4dc72cc1221a7808858d7855488c;p=thirdparty%2Fasterisk.git Merged revisions 254453 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r254453 | twilson | 2010-03-25 11:03:51 -0500 (Thu, 25 Mar 2010) | 9 lines Merged revisions 254451 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r254451 | twilson | 2010-03-25 10:57:29 -0500 (Thu, 25 Mar 2010) | 2 lines Handle new SRCCHANGE control message here too ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@254466 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/file.c b/main/file.c index 6dcc3b4522..0cfc78fff8 100644 --- a/main/file.c +++ b/main/file.c @@ -1260,6 +1260,7 @@ static int waitstream_core(struct ast_channel *c, const char *breakon, case AST_CONTROL_ANSWER: case AST_CONTROL_VIDUPDATE: case AST_CONTROL_SRCUPDATE: + case AST_CONTROL_SRCCHANGE: case AST_CONTROL_HOLD: case AST_CONTROL_UNHOLD: case -1: