[svn-commits] jpeeler: branch 1.6.1 r259679 - in /branches/1.6.1: ./ apps/app_voicemail.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Wed Apr 28 12:19:37 2010
New Revision: 259679

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=259679
Log:
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
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_voicemail.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/apps/app_voicemail.c?view=diff&rev=259679&r1=259678&r2=259679
==============================================================================
--- branches/1.6.1/apps/app_voicemail.c (original)
+++ branches/1.6.1/apps/app_voicemail.c Wed Apr 28 12:19:37 2010
@@ -11736,10 +11736,10 @@
 			}
 		}
 	}
-	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;
 }