[Asterisk-cvs] asterisk/apps app_voicemail.c,1.118,1.119

[markster at lists.digium.com]

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

Modified Files:
	app_voicemail.c 
Log Message:
Don't repeat option 3 (bug #1910)


Index: app_voicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- app_voicemail.c	26 Jun 2004 15:48:30 -0000	1.118
+++ app_voicemail.c	26 Jun 2004 16:06:19 -0000	1.119
@@ -3235,7 +3235,7 @@
 	return res;
 }
 
-static int vm_instructions(struct ast_channel *chan, struct vm_state *vms)
+static int vm_instructions(struct ast_channel *chan, struct vm_state *vms, int skipadvanced)
 {
 	int res = 0;
 	/* Play instructions and wait for new command */
@@ -3260,7 +3260,7 @@
 		} else {
 			if (vms->curmsg)
 				res = play_and_wait(chan, "vm-prev");
-			if (!res)
+			if (!res && !skipadvanced)
 				res = play_and_wait(chan, "vm-advopts");
 			if (!res)
 				res = play_and_wait(chan, "vm-repeat");
@@ -3810,6 +3810,8 @@
 					}
 					if (!cmd)
 						cmd = play_and_wait(chan, "vm-opts");
+					if (!cmd)
+						cmd = vm_instructions(chan, &vms, 1);
 				} else
 					cmd = 0;
 				break;
@@ -3819,7 +3821,7 @@
 					adsi_status(chan, vms.newmessages, vms.oldmessages, vms.lastmsg);
 				break;
 			default:	/* Nothing */
-				cmd = vm_instructions(chan, &vms);
+				cmd = vm_instructions(chan, &vms, 0);
 				break;
 			}
 		}