From: Jeff Peeler <jpeeler@digium.com>
Date: Wed, 6 May 2009 22:19:18 +0000 (+0000)
Subject: Merged revisions 192861 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~263
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa40e271ed96dd1ec741ad99276c11a38b0fce53;p=thirdparty%2Fasterisk.git

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
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@192869 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/features.c b/main/features.c
index 1d463d5b34..4e9459892d 100644
--- a/main/features.c
+++ b/main/features.c
@@ -3384,7 +3384,7 @@ static int park_exec_full(struct ast_channel *chan, void *data, struct ast_parki
 
 		/* 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", ""))
@@ -3393,7 +3393,7 @@ static int park_exec_full(struct ast_channel *chan, void *data, struct ast_parki
 		res = -1;
 	}
 
-	return res;
+	return -1;
 }
 
 static int park_exec(struct ast_channel *chan, void *data)