From: Jeff Peeler <jpeeler@digium.com>
Date: Wed, 28 Apr 2010 17:19:37 +0000 (+0000)
Subject: Merged revisions 259672 via svnmerge from
X-Git-Tag: 1.6.1.20-rc1~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6505011149d3687c967aa78231df1c9f8c33ec1f;p=thirdparty%2Fasterisk.git

Merged revisions 259672 via svnmerge from
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.1@259679 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index a5708b4029..7c7c6f9768 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -11736,10 +11736,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;
 }