[Asterisk-cvs] asterisk/apps app_dial.c,1.129,1.130

markster at lists.digium.com markster at lists.digium.com
Thu Jan 20 16:56:53 CST 2005


Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv18395/apps

Modified Files:
	app_dial.c 
Log Message:
Fix typos (bug #3381)


Index: app_dial.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_dial.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- app_dial.c	18 Jan 2005 16:47:33 -0000	1.129
+++ app_dial.c	20 Jan 2005 22:59:50 -0000	1.130
@@ -1306,11 +1306,11 @@
 		if (ast_test_flag(chan, AST_FLAG_MOH))
 			ast_moh_stop(chan);
 
-		if ((res = dial_exec(chan, dialdata)) == 0) {
+		if ((res = dial_exec_full(chan, dialdata, &peerflags)) == 0) {
 			if (ast_test_flag(&peerflags, DIAL_HALT_ON_DTMF)) {
 				if (!(res = ast_streamfile(chan, announce, chan->language)))
 					res = ast_waitstream(chan, AST_DIGIT_ANY);
-				if (!res) {
+				if (!res && sleep) {
 					if (!ast_test_flag(chan, AST_FLAG_MOH))
 						ast_moh_start(chan, NULL);
 					res = ast_waitfordigit(chan, sleep);
@@ -1318,8 +1318,12 @@
 			} else {
 				if (!(res = ast_streamfile(chan, announce, chan->language)))
 					res = ast_waitstream(chan, "");
-				if (!res) 
-					res = ast_safe_sleep(chan, sleep);
+				if (sleep) {
+					if (!ast_test_flag(chan, AST_FLAG_MOH))
+						ast_moh_start(chan, NULL);
+					if (!res) 
+						res = ast_safe_sleep(chan, sleep);
+				}
 			}
 		}
 




More information about the svn-commits mailing list