[asterisk-commits] rmudgett: trunk r368569 - in /trunk: ./ main/features.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue Jun  5 20:11:12 2012
New Revision: 368569

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=368569
Log:
Fix parked call performing a DTMF blind transfer after being retrieved.

When a parked call was retrieved from the parking lot, it could not do a
blind transfer because it caused the involved calls to be hung up
unconditionally.

* Made the ParkedCall application return the ast_bridge_call() return
value.

(closes issue ABE-2862)
Reported by: Vlad Povorozniuc
........

Merged revisions 368567 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 368568 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/main/features.c

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

Modified: trunk/main/features.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/features.c?view=diff&rev=368569&r1=368568&r2=368569
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Tue Jun  5 20:11:12 2012
@@ -5353,7 +5353,7 @@
 /*! \brief Pickup parked call */
 static int parked_call_exec(struct ast_channel *chan, const char *data)
 {
-	int res = 0;
+	int res;
 	struct ast_channel *peer = NULL;
 	struct parkeduser *pu;
 	struct ast_context *con;
@@ -5599,10 +5599,11 @@
 		}
 		ast_verb(3, "Channel %s tried to retrieve nonexistent parked call %d\n",
 			ast_channel_name(chan), park);
+		res = -1;
 	}
 
 	parkinglot_unref(parkinglot);
-	return -1;
+	return res;
 }
 
 /*!