diff options
| author | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-06-29 15:36:20 +0000 |
|---|---|---|
| committer | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-06-29 15:36:20 +0000 |
| commit | 532bf8f4aae125e97c80073fcbbbc55c2784057b (patch) | |
| tree | afb00c4a2607562c313d485590e3870f33a79701 /apps/app_dial.c | |
| parent | f4e69acdf3eb8390a392d48e63cb87fa76d2c19c (diff) | |
Merged revisions 325537 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r325537 | mnicholson | 2011-06-29 10:34:47 -0500 (Wed, 29 Jun 2011) | 2 lines
don't do native/remote bridging if a framehook is active on the channel
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@325538 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_dial.c')
| -rw-r--r-- | apps/app_dial.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 25172c743..d3b8009de 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -65,6 +65,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/aoc.h" #include "asterisk/ccss.h" #include "asterisk/indications.h" +#include "asterisk/framehook.h" /*** DOCUMENTATION <application name="Dial" language="en_US"> @@ -631,7 +632,8 @@ END_OPTIONS ); OPT_CALLER_HANGUP | OPT_CALLEE_TRANSFER | OPT_CALLER_TRANSFER | \ OPT_CALLEE_MONITOR | OPT_CALLER_MONITOR | OPT_CALLEE_PARK | \ OPT_CALLER_PARK | OPT_ANNOUNCE | OPT_CALLEE_MACRO | OPT_CALLEE_GOSUB) && \ - !chan->audiohooks && !peer->audiohooks) + !chan->audiohooks && !peer->audiohooks && \ + ast_framehook_list_is_empty(chan->framehooks) && ast_framehook_list_is_empty(peer->framehooks)) /* * The list of active channels |