diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-06 22:18:30 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-06 22:18:30 +0000 |
| commit | 76e4bdce619beec680e1a37c3e0aafb1fc778e14 (patch) | |
| tree | b5f75bf4474b64d2694c7549bb5051e74d614cd2 /main/features.c | |
| parent | e58fa9a7a3d23c24c2f066be38734f82bcdcddae (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@192865 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/features.c')
| -rw-r--r-- | main/features.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/features.c b/main/features.c index 6121a20e4..9ad0354ba 100644 --- a/main/features.c +++ b/main/features.c @@ -3070,7 +3070,7 @@ static int park_exec(struct ast_channel *chan, void *data) /* 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 @@ static int park_exec(struct ast_channel *chan, void *data) res = -1; } - return res; + return -1; } /*! |