[asterisk-commits] mmichelson: branch 1.6.0 r109577 - in /branches/1.6.0: ./ channels/chan_agent.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Mar 18 12:59:49 2008
New Revision: 109577

URL: http://svn.digium.com/view/asterisk?view=rev&rev=109577
Log:
Merged revisions 109576 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r109576 | mmichelson | 2008-03-18 12:59:18 -0500 (Tue, 18 Mar 2008) | 14 lines

Merged revisions 109575 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r109575 | mmichelson | 2008-03-18 12:58:11 -0500 (Tue, 18 Mar 2008) | 6 lines

Make sure an agent doesn't try to send dtmf to a NULL channel

closes issue #12242
Reported by Yourname


........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_agent.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_agent.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_agent.c?view=diff&rev=109577&r1=109576&r2=109577
==============================================================================
--- branches/1.6.0/channels/chan_agent.c (original)
+++ branches/1.6.0/channels/chan_agent.c Tue Mar 18 12:59:49 2008
@@ -595,7 +595,9 @@
 {
 	struct agent_pvt *p = ast->tech_pvt;
 	ast_mutex_lock(&p->lock);
-	ast_senddigit_begin(p->chan, digit);
+	if (p->chan) {
+		ast_senddigit_begin(p->chan, digit);
+	}
 	ast_mutex_unlock(&p->lock);
 	return 0;
 }
@@ -604,7 +606,9 @@
 {
 	struct agent_pvt *p = ast->tech_pvt;
 	ast_mutex_lock(&p->lock);
-	ast_senddigit_end(p->chan, digit, duration);
+	if (p->chan) {
+		ast_senddigit_end(p->chan, digit, duration);
+	}
 	ast_mutex_unlock(&p->lock);
 	return 0;
 }