diff options
author | Russell Bryant <russell@russellbryant.com> | 2006-03-21 18:22:38 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2006-03-21 18:22:38 +0000 |
commit | d56674b34179b85f26e344173223548f5da5b4a1 (patch) | |
tree | fa7342f69d8d35fc419985bbadcfa6c40aed35f0 /res | |
parent | c4601f623517105071c58a95b5ea99712f997262 (diff) |
Merged revisions 13961 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r13961 | russell | 2006-03-21 13:21:47 -0500 (Tue, 21 Mar 2006) | 3 lines
fix crash when using the ParkAndAnnounce application. When using this application,
there will be no peer channel to play the parking announcement to. (issue #6756)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@13962 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
-rw-r--r-- | res/res_features.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_features.c b/res/res_features.c index dab637655..7f2bdac2f 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -339,7 +339,7 @@ int ast_park_call(struct ast_channel *chan, struct ast_channel *peer, int timeou "Timeout: %ld\r\n" "CallerID: %s\r\n" "CallerIDName: %s\r\n" - ,pu->parkingnum, pu->chan->name, peer->name + ,pu->parkingnum, pu->chan->name, peer ? peer->name : "" ,(long)pu->start.tv_sec + (long)(pu->parkingtime/1000) - (long)time(NULL) ,(pu->chan->cid.cid_num ? pu->chan->cid.cid_num : "<unknown>") ,(pu->chan->cid.cid_name ? pu->chan->cid.cid_name : "<unknown>") |