[svn-commits] russell: trunk r70088 - in /trunk: ./ channels/

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Jun 19 14:15:03 2007
New Revision: 70088

URL: http://svn.digium.com/view/asterisk?view=rev&rev=70088
Log:
Merged revisions 70084 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r70084 | russell | 2007-06-19 14:13:45 -0500 (Tue, 19 Jun 2007) | 3 lines

Only attempt to queue a hangup on the owner channel if it actually exists.
(issue #9795, patch from zandbelt)

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_gtalk.c
    trunk/channels/chan_jingle.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_gtalk.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_gtalk.c?view=diff&rev=70088&r1=70087&r2=70088
==============================================================================
--- trunk/channels/chan_gtalk.c (original)
+++ trunk/channels/chan_gtalk.c Tue Jun 19 14:15:03 2007
@@ -690,10 +690,10 @@
 	if(!from)
 		from = client->connection->jid->full;
 
-
 	if (tmp) {
 		tmp->alreadygone = 1;
-		ast_queue_hangup(tmp->owner);
+		if (tmp->owner)
+			ast_queue_hangup(tmp->owner);
 	} else
 		ast_log(LOG_NOTICE, "Whoa, didn't find call!\n");
 	gtalk_response(client, from, pak, NULL, NULL);

Modified: trunk/channels/chan_jingle.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_jingle.c?view=diff&rev=70088&r1=70087&r2=70088
==============================================================================
--- trunk/channels/chan_jingle.c (original)
+++ trunk/channels/chan_jingle.c Tue Jun 19 14:15:03 2007
@@ -571,7 +571,8 @@
 
 	if (tmp) {
 		tmp->alreadygone = 1;
-		ast_queue_hangup(tmp->owner);
+		if (tmp->owner)
+			ast_queue_hangup(tmp->owner);
 	} else
 		ast_log(LOG_NOTICE, "Whoa, didn't find call!\n");
 	jingle_response(client, pak, NULL, NULL);