updating to current 1.2

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@8046 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 6 insertions, 2 deletions

diff --git a/app.c b/app.c
index 998135fb5..95347a27e 100644
--- a/app.c
+++ b/app.c
@@ -316,8 +316,12 @@ int ast_dtmf_stream(struct ast_channel *chan,struct ast_channel *peer,char *digi
 				}
 			}
 		}
-		if (peer)
-			res = ast_autoservice_stop(peer);
+		if (peer) {
+			/* Stop autoservice on the peer channel, but don't overwrite any error condition 
+			   that has occurred previously while acting on the primary channel */	
+			if (ast_autoservice_stop(peer) && !res)
+				res = -1;
+		}
 	}
 	return res;
 }