[svn-commits] jpeeler: trunk r192861 - in /trunk: ./ main/features.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Wed May  6 17:17:27 2009
New Revision: 192861

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=192861
Log:
Merged revisions 192858 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r192858 | jpeeler | 2009-05-06 17:15:19 -0500 (Wed, 06 May 2009) | 10 lines
  
  Make ParkedCall application stop execution of the dialplan after hang up
  
  Just changed park_exec to always return non-zero. I really wasn't entirely sure
  at first if this was a bug. Decided it was since it would be surprising when 
  not using ParkedCall in the dialplan to hang up and have dialplan execution
  continue.
  
  (closes issue #14555)
  Reported by: francesco_r
........

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

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

Modified: trunk/main/features.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/main/features.c?view=diff&rev=192861&r1=192860&r2=192861
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Wed May  6 17:17:27 2009
@@ -3484,7 +3484,7 @@
 
 		/* Simulate the PBX hanging up */
 		ast_hangup(peer);
-		return res;
+		return -1;
 	} else {
 		/*! \todo XXX Play a message XXX */
 		if (ast_stream_and_wait(chan, "pbx-invalidpark", ""))
@@ -3493,7 +3493,7 @@
 		res = -1;
 	}
 
-	return res;
+	return -1;
 }
 
 static int park_exec(struct ast_channel *chan, void *data)