Index: app.c
===================================================================
RCS file: /usr/cvsroot/asterisk/app.c,v
retrieving revision 1.21
diff -u -r1.21 app.c
--- app.c	1 Jun 2004 19:38:06 -0000	1.21
+++ app.c	15 Jun 2004 17:38:41 -0000
@@ -472,8 +472,9 @@
 		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: apps/app_controlplayback.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_controlplayback.c,v
retrieving revision 1.5
diff -u -r1.5 app_controlplayback.c
--- apps/app_controlplayback.c	27 May 2004 05:06:32 -0000	1.5
+++ apps/app_controlplayback.c	15 Jun 2004 17:38:41 -0000
@@ -107,6 +107,11 @@
 	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;
 }