[svn-commits] mmichelson: branch 1.6.0 r134477 - in /branches/1.6.0: ./ main/app.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Wed Jul 30 13:33:58 2008
New Revision: 134477

URL: http://svn.digium.com/view/asterisk?view=rev&rev=134477
Log:
Merged revisions 134476 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r134476 | mmichelson | 2008-07-30 13:33:12 -0500 (Wed, 30 Jul 2008) | 12 lines

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

........
r134475 | mmichelson | 2008-07-30 13:31:47 -0500 (Wed, 30 Jul 2008) | 4 lines

Fix a spot where a function could return without bringing
a channel out of autoservice.


........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/app.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/app.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/app.c?view=diff&rev=134477&r1=134476&r2=134477
==============================================================================
--- branches/1.6.0/main/app.c (original)
+++ branches/1.6.0/main/app.c Wed Jul 30 13:33:58 2008
@@ -256,8 +256,12 @@
 		res = ast_waitfor(chan, 100);
 
 	/* ast_waitfor will return the number of remaining ms on success */
-	if (res < 0)
+	if (res < 0) {
+		if (peer) {
+			ast_autoservice_stop(peer);
+		}
 		return res;
+	}
 
 	if (ast_opt_transmit_silence) {
 		silgen = ast_channel_start_silence_generator(chan);