diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-12 18:01:54 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-12 18:01:54 +0000 |
| commit | 35140d2626e3a3a60fcff1743a70a390e10f1bdd (patch) | |
| tree | fe1dfe619808d4b02f55b621f2cbe1d2a5474df9 /main/features.c | |
| parent | 84e274b4bfb91bf2bac6cc85af58a3ff0dbfe594 (diff) | |
Merged revisions 175188 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r175188 | jpeeler | 2009-02-12 12:00:11 -0600 (Thu, 12 Feb 2009) | 12 lines
Merged revisions 175187 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r175187 | jpeeler | 2009-02-12 11:57:10 -0600 (Thu, 12 Feb 2009) | 6 lines
Fix crash in event of failed attempt to transfer to parking
The peer may not necessarily exist, such as in the case of a transfer to
ParkAndAnnounce. In this case don't try to play a sound to it.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@175190 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/features.c')
| -rw-r--r-- | main/features.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/main/features.c b/main/features.c index 7f8b78ca0..ce07dfa24 100644 --- a/main/features.c +++ b/main/features.c @@ -756,7 +756,8 @@ static int masq_park_call(struct ast_channel *rchan, struct ast_channel *peer, i } if ((args->pu = park_space_reserve(rchan, peer, args)) == NULL) { - ast_stream_and_wait(peer, "beeperr", ""); + if (peer) + ast_stream_and_wait(peer, "beeperr", ""); return AST_FEATURE_RETURN_PARKFAILED; } |