Merged revisions 47523 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Mon, 13 Nov 2006 01:16:30 +0000 (01:16 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Mon, 13 Nov 2006 01:16:30 +0000 (01:16 +0000)
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

channels/chan_zap.c

index 9c58f5a..47c55c8 100644 (file)
@@ -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);