[svn-commits] branch 1.2 - r8134 /branches/1.2/res/res_features.c

[svn-commits at lists.digium.com]

Author: mattf
Date: Tue Jan 17 12:29:57 2006
New Revision: 8134

URL: http://svn.digium.com/view/asterisk?rev=8134&view=rev
Log:
Backport of fix for #6094

Modified:
    branches/1.2/res/res_features.c

Modified: branches/1.2/res/res_features.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/res/res_features.c?rev=8134&r1=8133&r2=8134&view=diff
==============================================================================
--- branches/1.2/res/res_features.c (original)
+++ branches/1.2/res/res_features.c Tue Jan 17 12:29:57 2006
@@ -1280,10 +1280,12 @@
 			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);