kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-17 23:38:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Backport of fix for #6094

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@8134 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Fredrickson
2006-01-17 18:29:57 +00:00
parent 4fbba55f14
commit 4efe647169
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/res_features.c
View File

@@ -1280,10 +1280,12 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
if (!(monitor_app = pbx_findapp("Monitor"))) if (!(monitor_app = pbx_findapp("Monitor")))
monitor_ok=0; monitor_ok=0;
} }
if ((monitor_exec = pbx_builtin_getvar_helper(chan, "AUTO_MONITOR"))) if (monitor_app) {
pbx_exec(chan, monitor_app, monitor_exec, 1); if ((monitor_exec = pbx_builtin_getvar_helper(chan, "AUTO_MONITOR")))
else if ((monitor_exec = pbx_builtin_getvar_helper(peer, "AUTO_MONITOR"))) pbx_exec(chan, monitor_app, monitor_exec, 1);
pbx_exec(peer, monitor_app, monitor_exec, 1); else if ((monitor_exec = pbx_builtin_getvar_helper(peer, "AUTO_MONITOR")))
pbx_exec(peer, monitor_app, monitor_exec, 1);
}
} }
set_config_flags(chan, peer, config); set_config_flags(chan, peer, config);