[asterisk-commits] branch kpfleming/test-for-merging - r8143 in /team/kpfleming/test-for-merging...

[asterisk-commits at lists.digium.com]

Author: root
Date: Tue Jan 17 14:33:22 2006
New Revision: 8143

URL: http://svn.digium.com/view/asterisk?rev=8143&view=rev
Log:
automerge commit

Modified:
    team/kpfleming/test-for-merging/   (props changed)
    team/kpfleming/test-for-merging/apps/app_festival.c
    team/kpfleming/test-for-merging/res/res_features.c

Propchange: team/kpfleming/test-for-merging/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jan 17 14:33:22 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-8125
+/branches/1.2:1-8142

Modified: team/kpfleming/test-for-merging/apps/app_festival.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/test-for-merging/apps/app_festival.c?rev=8143&r1=8142&r2=8143&view=diff
==============================================================================
--- team/kpfleming/test-for-merging/apps/app_festival.c (original)
+++ team/kpfleming/test-for-merging/apps/app_festival.c Tue Jan 17 14:33:22 2006
@@ -175,7 +175,8 @@
 	if (chan->_state != AST_STATE_UP)
 		ast_answer(chan);
 	ast_stopstream(chan);
-
+	ast_indicate(chan, -1);
+	
 	owriteformat = chan->writeformat;
 	res = ast_set_write_format(chan, AST_FORMAT_SLINEAR);
 	if (res < 0) {

Modified: team/kpfleming/test-for-merging/res/res_features.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/test-for-merging/res/res_features.c?rev=8143&r1=8142&r2=8143&view=diff
==============================================================================
--- team/kpfleming/test-for-merging/res/res_features.c (original)
+++ team/kpfleming/test-for-merging/res/res_features.c Tue Jan 17 14:33:22 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);