kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't repeat option 3 (bug #1910)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3316 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-06-26 16:06:19 +00:00
parent d9ed36059c
commit 88bcbb2368
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/app_voicemail.c
View File

@@ -3235,7 +3235,7 @@ static int vm_intro_pt(struct ast_channel *chan,struct vm_state *vms)
return res; 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; int res = 0;
/* Play instructions and wait for new command */ /* Play instructions and wait for new command */
@@ -3260,7 +3260,7 @@ static int vm_instructions(struct ast_channel *chan, struct vm_state *vms)
} else { } else {
if (vms->curmsg) if (vms->curmsg)
res = play_and_wait(chan, "vm-prev"); res = play_and_wait(chan, "vm-prev");
if (!res) if (!res && !skipadvanced)
res = play_and_wait(chan, "vm-advopts"); res = play_and_wait(chan, "vm-advopts");
if (!res) if (!res)
res = play_and_wait(chan, "vm-repeat"); res = play_and_wait(chan, "vm-repeat");
@@ -3810,6 +3810,8 @@ static int vm_execmain(struct ast_channel *chan, void *data)
} }
if (!cmd) if (!cmd)
cmd = play_and_wait(chan, "vm-opts"); cmd = play_and_wait(chan, "vm-opts");
if (!cmd)
cmd = vm_instructions(chan, &vms, 1);
} else } else
cmd = 0; cmd = 0;
break; break;
@@ -3819,7 +3821,7 @@ static int vm_execmain(struct ast_channel *chan, void *data)
adsi_status(chan, vms.newmessages, vms.oldmessages, vms.lastmsg); adsi_status(chan, vms.newmessages, vms.oldmessages, vms.lastmsg);
break; break;
default: /* Nothing */ default: /* Nothing */
cmd = vm_instructions(chan, &vms); cmd = vm_instructions(chan, &vms, 0);
break; break;
} }
} }