[asterisk-commits] mmichelson: trunk r89619 - in /trunk: ./ apps/app_playback.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon Nov 26 17:11:29 2007
New Revision: 89619

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89619
Log:
Merged revisions 89618 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89618 | mmichelson | 2007-11-26 17:10:49 -0600 (Mon, 26 Nov 2007) | 7 lines

After issuing a "say load new", if a caller hangs up during the middle of playback of a number,
app_playback will continue to try to play the remaining files. With this change, no more files will
be played back upon hangup.

(closes issue #11345, reported and patched by IgorG)


........

Modified:
    trunk/   (props changed)
    trunk/apps/app_playback.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_playback.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_playback.c?view=diff&rev=89619&r1=89618&r2=89619
==============================================================================
--- trunk/apps/app_playback.c (original)
+++ trunk/apps/app_playback.c Mon Nov 26 17:11:29 2007
@@ -185,7 +185,7 @@
 	AST_LIST_INSERT_HEAD(&head, n, entries);
 
 	/* scan the body, one piece at a time */
-	while ( ret <= 0 && (x = strsep(&rule, ",")) ) { /* exit on key */
+	while ( !ret && (x = strsep(&rule, ",")) ) { /* exit on key */
 		char fn[128];
 		const char *p, *fmt, *data; /* format and data pointers */
 
@@ -234,6 +234,10 @@
 				strcpy(fn2 + l, data);
 				ret = do_say(a, fn2, options, depth);
 			}
+			
+			if (ret) {
+				break;
+			}
 		}
 	}
 	ast_var_delete(n);