[asterisk-commits] jpeeler: branch 1.6.2 r300951 - in /branches/1.6.2: ./ apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Fri Jan  7 11:23:37 2011
New Revision: 300951

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=300951
Log:
Merged revisions 300918 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r300918 | jpeeler | 2011-01-07 11:13:21 -0600 (Fri, 07 Jan 2011) | 7 lines
  
  Ensure good bye prompt in voicemail is played at the correct time.
  
  Specifically in the case of timing out but not leaving voicemail nothing
  should be heard. And when leaving voicemail it should be heard.
  
  ABE-2647
........

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

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: branches/1.6.2/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/apps/app_voicemail.c?view=diff&rev=300951&r1=300950&r2=300951
==============================================================================
--- branches/1.6.2/apps/app_voicemail.c (original)
+++ branches/1.6.2/apps/app_voicemail.c Fri Jan  7 11:23:37 2011
@@ -5710,7 +5710,7 @@
 		}
 		if (res == '0') {
 			goto transfer;
-		} else if (res > 0)
+		} else if (res > 0 && res != 't')
 			res = 0;
 
 		if (duration < vmminsecs)
@@ -10015,6 +10015,11 @@
 	}
 
 	res = leave_voicemail(chan, args.argv0, &leave_options);
+	if (res == 't') {
+		ast_play_and_wait(chan, "vm-goodbye");
+		res = 0;
+	}
+
 	if (res == OPERATOR_EXIT) {
 		res = 0;
 	}
@@ -11992,10 +11997,10 @@
 		/* Hang up or timeout, so delete the recording. */
 		ast_filedelete(tempfile, NULL);
 	}
-	if (cmd == 't')
-		cmd = 0;
-	else if (outsidecaller) /* won't play if time out occurs */
+
+	if (cmd != 't' && outsidecaller)
 		ast_play_and_wait(chan, "vm-goodbye");
+
 	return cmd;
 }