From 129280f4eee2fbf0c7ac54f61a2fcab10bdda197 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Mon, 13 Nov 2006 01:12:01 +0000 Subject: [PATCH] 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/branches/1.4@47523 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_zap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 3dbbb3be87..348856f106 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -6541,7 +6541,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);