[Asterisk-cvs] asterisk/res res_parking.c,1.19,1.20

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/res
In directory mongoose.digium.com:/tmp/cvs-serv30679/res

Modified Files:
	res_parking.c 
Log Message:
Fix double parking crash (bug #1302)


Index: res_parking.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_parking.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- res_parking.c	6 Apr 2004 22:17:32 -0000	1.19
+++ res_parking.c	7 Apr 2004 04:11:00 -0000	1.20
@@ -575,11 +575,11 @@
 		   were the person called. */
 		if (option_verbose > 2) 
 			ast_verbose(VERBOSE_PREFIX_3 "Channel %s connected to parked call %d\n", chan->name, park);
-		res = ast_bridge_call(peer, chan, 1, 1, 0);
+		res = ast_bridge_call(chan, peer, 1, 1, 0);
 		/* Simulate the PBX hanging up */
-		if (res != AST_PBX_KEEPALIVE)
+		if (res != AST_PBX_NO_HANGUP_PEER)
 			ast_hangup(peer);
-		return -1;
+		return res;
 	} else {
 		/* XXX Play a message XXX */
 	  dres = ast_streamfile(chan, "pbx-invalidpark", chan->language);