[asterisk-commits] jpeeler: branch 1.6.0 r192865 - in /branches/1.6.0: ./ main/features.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Wed May  6 17:18:30 2009
New Revision: 192865

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

................
  r192861 | jpeeler | 2009-05-06 17:17:27 -0500 (Wed, 06 May 2009) | 17 lines
  
  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:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/features.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/features.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/main/features.c?view=diff&rev=192865&r1=192864&r2=192865
==============================================================================
--- branches/1.6.0/main/features.c (original)
+++ branches/1.6.0/main/features.c Wed May  6 17:18:30 2009
@@ -3070,7 +3070,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", ""))
@@ -3079,7 +3079,7 @@
 		res = -1;
 	}
 
-	return res;
+	return -1;
 }
 
 /*!