Fix unexpected behavior in voicemail (bug #1856)
authorMark Spencer <markster@digium.com>
Tue, 15 Jun 2004 20:33:26 +0000 (20:33 +0000)
committerMark Spencer <markster@digium.com>
Tue, 15 Jun 2004 20:33:26 +0000 (20:33 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3219 65c4cc65-6c06-0410-ace0-fbb531ad65f3

app.c
apps/app_controlplayback.c

diff --git a/app.c b/app.c
index 2f3ac6c..f041bd3 100755 (executable)
--- a/app.c
+++ b/app.c
@@ -472,8 +472,9 @@ int ast_control_streamfile(struct ast_channel *chan, char *file, char *fwd, char
                if (res == -1)
                        break;
 
+               /* if we get one of our stop chars, return it to the calling function */
                if (stop && strchr(stop, res)) {
-                       res = 0;
+                       /* res = 0; */
                        break;
                }
        }
index 850ebed..2ec8de1 100755 (executable)
@@ -107,6 +107,11 @@ static int controlplayback_exec(struct ast_channel *chan, void *data)
        res = ast_control_streamfile(chan, file, fwd, rev, stop, pause, skipms);
 
        LOCAL_USER_REMOVE(u);
+       
+       /* If we stopped on one of our stop keys, return 0  */
+       if(stop && strchr(stop, res)) 
+               res = 0;
+       
        return res;
 }