From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Mon, 13 Nov 2006 01:16:30 +0000 (+0000)
Subject: Merged revisions 47523 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~4023
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8dbe2063edad3fe0d37085c89be386f32f748f6b;p=thirdparty%2Fasterisk.git

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)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47524 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 9c58f5a143..47c55c893d 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -6874,7 +6874,9 @@ static int handle_init_event(struct zt_pvt *i, int event)
 		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);