From 79caed98062c0c29c1f6bb8f31e2b22f51f1fca7 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 18 Jan 2006 02:00:34 +0000 Subject: automerge commit git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@8172 f38db490-d61c-443f-a65b-d21fe96a405b --- res/res_features.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'res') diff --git a/res/res_features.c b/res/res_features.c index 6e4a0ac2c..bf23129ae 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -1280,10 +1280,12 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast if (!(monitor_app = pbx_findapp("Monitor"))) monitor_ok=0; } - if ((monitor_exec = pbx_builtin_getvar_helper(chan, "AUTO_MONITOR"))) - pbx_exec(chan, monitor_app, monitor_exec, 1); - else if ((monitor_exec = pbx_builtin_getvar_helper(peer, "AUTO_MONITOR"))) - pbx_exec(peer, monitor_app, monitor_exec, 1); + if (monitor_app) { + if ((monitor_exec = pbx_builtin_getvar_helper(chan, "AUTO_MONITOR"))) + pbx_exec(chan, 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); -- cgit v1.2.3