mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 02:37:10 +00:00 
			
		
		
		
	Don't repeat option 3 (bug #1910)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3316 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		| @@ -3235,7 +3235,7 @@ static int vm_intro_pt(struct ast_channel *chan,struct vm_state *vms) | ||||
| 	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 @@ static int vm_instructions(struct ast_channel *chan, struct vm_state *vms) | ||||
| 		} 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 @@ static int vm_execmain(struct ast_channel *chan, void *data) | ||||
| 					} | ||||
| 					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 @@ static int vm_execmain(struct ast_channel *chan, void *data) | ||||
| 					adsi_status(chan, vms.newmessages, vms.oldmessages, vms.lastmsg); | ||||
| 				break; | ||||
| 			default:	/* Nothing */ | ||||
| 				cmd = vm_instructions(chan, &vms); | ||||
| 				cmd = vm_instructions(chan, &vms, 0); | ||||
| 				break; | ||||
| 			} | ||||
| 		} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user