From ada1e768c46a689636de407e0692ea742894fd1f Mon Sep 17 00:00:00 2001
From: Mark Spencer <markster@digium.com>
Date: Tue, 15 Jun 2004 20:33:26 +0000
Subject: [PATCH] Fix unexpected behavior in voicemail (bug #1856)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3219 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
app.c | 3 ++-
apps/app_controlplayback.c | 5 +++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/app.c b/app.c
index 2f3ac6cd7b..f041bd323a 100755
--- 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;
}
}
diff --git a/apps/app_controlplayback.c b/apps/app_controlplayback.c
index 850ebed9cc..2ec8de1b64 100755
--- a/apps/app_controlplayback.c
+++ b/apps/app_controlplayback.c
@@ -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;
}
--
GitLab