Merged revisions 148754 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r148754 | kpfleming | 2008-10-14 13:31:40 +0200 (Tue, 14 Oct 2008) | 2 lines
  
  fix some references to the owner of a private structure that may not be present
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@148763 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-10-14 11:35:52 +00:00
parent c99e35bb04
commit a6aaf36b47

View File

@@ -18422,7 +18422,7 @@ static int handle_request_bye(struct sip_pvt *p, struct sip_request *req)
/* Get RTCP quality before end of call */
if (p->do_history || p->owner) {
struct ast_channel *bridge = ast_bridged_channel(p->owner);
struct ast_channel *bridge = p->owner ? ast_bridged_channel(p->owner) : NULL;
char *videoqos, *textqos;
if (p->rtp) {
@@ -18443,7 +18443,9 @@ static int handle_request_bye(struct sip_pvt *p, struct sip_request *req)
append_history(p, "RTCPaudioRTT", "Quality:%s", audioqos_rtt);
}
ast_rtp_set_vars(p->owner, p->rtp);
if (p->owner) {
ast_rtp_set_vars(p->owner, p->rtp);
}
}
if (bridge) {