[asterisk-commits] branch 1.2 - r7970 /branches/1.2/app.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Tue Jan 10 23:26:21 2006
New Revision: 7970

URL: http://svn.digium.com/view/asterisk?rev=7970&view=rev
Log:
don't override an error condition that occurred when acting on the primary channel
when stopping the autoservice on the peer channel.  (from issue #6087)

Modified:
    branches/1.2/app.c

Modified: branches/1.2/app.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/app.c?rev=7970&r1=7969&r2=7970&view=diff
==============================================================================
--- branches/1.2/app.c (original)
+++ branches/1.2/app.c Tue Jan 10 23:26:21 2006
@@ -316,8 +316,12 @@
 				}
 			}
 		}
-		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;
 }