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)

........

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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 5fb642f..a306f9d 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -6826,12 +6826,13 @@ static int advanced_options(struct ast_channel *chan, struct ast_vm_user *vmu, s
                                        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 @@ static int advanced_options(struct ast_channel *chan, struct ast_vm_user *vmu, s
                                res = -1;
                }
                break;
-
+               
        case 1: /* Reply */
                /* Send reply directly to sender */
                if (ast_strlen_zero(cid))