Fix VM "goodbye" for real
authorMark Spencer <markster@digium.com>
Tue, 13 May 2003 01:50:10 +0000 (01:50 +0000)
committerMark Spencer <markster@digium.com>
Tue, 13 May 2003 01:50:10 +0000 (01:50 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1010 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_voicemail2.c

index ed6f0f1..50d7bc4 100755 (executable)
@@ -2134,13 +2134,6 @@ static int vm_execmain(struct ast_channel *chan, void *data)
                        case '0':
                                cmd = vm_options(chan, vmu, &vms, vmfmts);
                                break;
-                       case '#':
-                               ast_stopstream(chan);
-                               adsi_goodbye(chan);
-                               cmd = play_and_wait(chan, "vm-goodbye");
-                               if (cmd > 0)
-                                       cmd = '#';
-                               break;
                        default:        /* Nothing */
                                cmd = vm_instructions(chan, &vms);
                                break;
@@ -2158,6 +2151,9 @@ out:
        if (res > -1) {
                ast_stopstream(chan);
                adsi_goodbye(chan);
+               res = play_and_wait(chan, "vm-goodbye");
+               if (res > 0)
+                       res = 0;
                if (useadsi)
                        adsi_unload_session(chan);
        }