[svn-commits] trunk r28170 - in /trunk: ./ apps/app_voicemail.c

[svn-commits at lists.digium.com]

Author: file
Date: Thu May 18 09:40:20 2006
New Revision: 28170

URL: http://svn.digium.com/view/asterisk?rev=28170&view=rev
Log:
Merged revisions 28169 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r28169 | file | 2006-05-18 11:27:21 -0300 (Thu, 18 May 2006) | 2 lines

Fix endless looping message by checking value of res before doing retries stuff. (issue #7140 reported by tanischen)

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_voicemail.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_voicemail.c?rev=28170&r1=28169&r2=28170&view=diff
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Thu May 18 09:40:20 2006
@@ -6826,12 +6826,13 @@
 					res = ast_play_and_wait(chan, "vm-star-cancel");
 				if (!res)
 					res = ast_waitfordigit(chan, 6000);
-				if (!res)
+				if (!res) {
 					retries++;
-				if (retries > 3)
-					res = 't';
+					if (retries > 3)
+						res = 't';
+				}
 				break; 
-
+				
 			}
 			if (res == 't')
 				res = 0;
@@ -6839,7 +6840,7 @@
 				res = -1;
 		}
 		break;
-
+		
 	case 1:	/* Reply */
 		/* Send reply directly to sender */
 		if (ast_strlen_zero(cid))