From: Joshua Colp <jcolp@digium.com>
Date: Mon, 22 Oct 2007 16:19:01 +0000 (+0000)
Subject: Merged revisions 86754 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~1118
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=967466da292177fafed7e7f1fb059bed0843ad66;p=thirdparty%2Fasterisk.git

Merged revisions 86754 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r86754 | file | 2007-10-22 13:15:18 -0300 (Mon, 22 Oct 2007) | 4 lines

Make sure res is a positive value before performing the check to determine whether the user stopped it or not.
(closes issue #11023)
Reported by: cfc

........


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

diff --git a/apps/app_controlplayback.c b/apps/app_controlplayback.c
index c7eb59184c..18b8d43270 100644
--- a/apps/app_controlplayback.c
+++ b/apps/app_controlplayback.c
@@ -142,7 +142,7 @@ static int controlplayback_exec(struct ast_channel *chan, void *data)
 	res = ast_control_streamfile(chan, args.filename, args.fwd, args.rev, args.stop, args.pause, args.restart, skipms, &offsetms);
 
 	/* If we stopped on one of our stop keys, return 0  */
-	if (args.stop && strchr(args.stop, res)) {
+	if (res > 0 && args.stop && strchr(args.stop, res)) {
 		res = 0;
 		pbx_builtin_setvar_helper(chan, "CPLAYBACKSTATUS", "USERSTOPPED");
 	} else {