automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@28211 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index f61f58e86d8d37031c7dbd7165ad2fb12a804a8c..35eedeca699dc22bbfa756b58816b1da7f442dfb 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -6520,20 +6520,21 @@ 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';
-                                                       break; 
-
+                                                       if (retries > 3)
+                                                               res = 't';
                                                }
-                                       if (res == 't')
-                                               res = 0;
-                                       else if (res == '*')
-                                               res = -1;
+                                               break; 
+                                               
                                }
+                               if (res == 't')
+                                       res = 0;
+                               else if (res == '*')
+                                       res = -1;
                        }
-
+               }
+               
        }
        else if (option == 1) { /* Reply */
                /* Send reply directly to sender */