[asterisk-commits] tilghman: trunk r47524 - in /trunk: ./ channels/chan_zap.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Sun Nov 12 19:16:30 2006
New Revision: 47524

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

................
r47523 | tilghman | 2006-11-12 19:12:01 -0600 (Sun, 12 Nov 2006) | 10 lines

Merged revisions 47522 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r47522 | tilghman | 2006-11-12 18:34:44 -0600 (Sun, 12 Nov 2006) | 2 lines

Don't play dialtone if the seizing the channel fails (Bug 7754)

........

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

Modified:
    trunk/   (props changed)
    trunk/channels/chan_zap.c

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

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?view=diff&rev=47524&r1=47523&r2=47524
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Sun Nov 12 19:16:30 2006
@@ -6874,7 +6874,9 @@
 		case SIG_FXOLS:
 		case SIG_FXOGS:
 		case SIG_FXOKS:
-		        zt_set_hook(i->subs[SUB_REAL].zfd, ZT_OFFHOOK);
+			res = zt_set_hook(i->subs[SUB_REAL].zfd, ZT_OFFHOOK);
+			if (res && (errno == EBUSY))
+				break;
 			if (i->cidspill) {
 				/* Cancel VMWI spill */
 				free(i->cidspill);