automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@28211 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-05-18 15:07:38 +00:00
parent 1dea733878
commit f209b6fe9b

View File

@@ -6520,19 +6520,20 @@ static int advanced_options(struct ast_channel *chan, struct ast_vm_user *vmu, s
res = ast_play_and_wait(chan, "vm-star-cancel"); res = ast_play_and_wait(chan, "vm-star-cancel");
if (!res) if (!res)
res = ast_waitfordigit(chan, 6000); res = ast_waitfordigit(chan, 6000);
if (!res) if (!res) {
retries++; retries++;
if (retries > 3) if (retries > 3)
res = 't'; res = 't';
break;
} }
if (res == 't') break;
res = 0;
else if (res == '*')
res = -1;
} }
if (res == 't')
res = 0;
else if (res == '*')
res = -1;
} }
}
} }
else if (option == 1) { /* Reply */ else if (option == 1) { /* Reply */