mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-28 15:11:12 +00:00
Fix VM "goodbye" for real
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1010 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -2134,13 +2134,6 @@ static int vm_execmain(struct ast_channel *chan, void *data)
|
|||||||
case '0':
|
case '0':
|
||||||
cmd = vm_options(chan, vmu, &vms, vmfmts);
|
cmd = vm_options(chan, vmu, &vms, vmfmts);
|
||||||
break;
|
break;
|
||||||
case '#':
|
|
||||||
ast_stopstream(chan);
|
|
||||||
adsi_goodbye(chan);
|
|
||||||
cmd = play_and_wait(chan, "vm-goodbye");
|
|
||||||
if (cmd > 0)
|
|
||||||
cmd = '#';
|
|
||||||
break;
|
|
||||||
default: /* Nothing */
|
default: /* Nothing */
|
||||||
cmd = vm_instructions(chan, &vms);
|
cmd = vm_instructions(chan, &vms);
|
||||||
break;
|
break;
|
||||||
@@ -2158,6 +2151,9 @@ out:
|
|||||||
if (res > -1) {
|
if (res > -1) {
|
||||||
ast_stopstream(chan);
|
ast_stopstream(chan);
|
||||||
adsi_goodbye(chan);
|
adsi_goodbye(chan);
|
||||||
|
res = play_and_wait(chan, "vm-goodbye");
|
||||||
|
if (res > 0)
|
||||||
|
res = 0;
|
||||||
if (useadsi)
|
if (useadsi)
|
||||||
adsi_unload_session(chan);
|
adsi_unload_session(chan);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user