diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-13 01:12:01 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-13 01:12:01 +0000 |
| commit | 60e78e83ff527565a16aa2f496508780f625e836 (patch) | |
| tree | a029a91ec3a12de9171f9c833a4ede953507edb5 /channels | |
| parent | 0d5e6334bb463b2c6c552ef96ff02c0f97632384 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.4@47523 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_zap.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 3dbbb3be8..348856f10 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); |