]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 259672 via svnmerge from
authorJeff Peeler <jpeeler@digium.com>
Wed, 28 Apr 2010 17:19:12 +0000 (17:19 +0000)
committerJeff Peeler <jpeeler@digium.com>
Wed, 28 Apr 2010 17:19:12 +0000 (17:19 +0000)
https://origsvn.digium.com/svn/asterisk/trunk

................
  r259672 | jpeeler | 2010-04-28 12:18:43 -0500 (Wed, 28 Apr 2010) | 11 lines

  Merged revisions 259664 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r259664 | jpeeler | 2010-04-28 12:13:29 -0500 (Wed, 28 Apr 2010) | 4 lines

    Do not play goodbye prompt after timeout of message review.

    ABE-2124
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@259676 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_voicemail.c

index 52279fcc03bb5a06b20119d79f07c4c223fbe53f..ddf3e1ec83ce5c3ff06434554432f8ab635de289 100644 (file)
@@ -10545,10 +10545,10 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re
                        }
                }
        }
-       if (outsidecaller)
-               ast_play_and_wait(chan, "vm-goodbye");
        if (cmd == 't')
                cmd = 0;
+       else if (outsidecaller) /* won't play if time out occurs */
+               ast_play_and_wait(chan, "vm-goodbye");
        return cmd;
 }