diff options
| author | Russell Bryant <russell@russellbryant.com> | 2006-05-19 14:51:08 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2006-05-19 14:51:08 +0000 |
| commit | 5d24426e40103f93f62793efd63112b0db3df352 (patch) | |
| tree | 7d95b4f0ec65cd63338f8b00a3ea4a93222323a6 /channels/chan_zap.c | |
| parent | 3be9c811f1340c5a8e1d3e2f2bde3914cb8ca3e7 (diff) | |
fix up a patch that did not merge properly from 1.2 ... weird
(issue #6866, flefoll)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@28592 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_zap.c')
| -rw-r--r-- | channels/chan_zap.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index ff87f1fb3..d63957985 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -6495,18 +6495,18 @@ static int handle_init_event(struct zt_pvt *i, int event) case ZT_EVENT_NOALARM: i->inalarm = 0; ast_log(LOG_NOTICE, "Alarm cleared on channel %d\n", i->channel); + manager_event(EVENT_FLAG_SYSTEM, "AlarmClear", + "Channel: %d\r\n", i->channel); break; - manager_event(EVENT_FLAG_SYSTEM, "AlarmClear", - "Channel: %d\r\n", i->channel); case ZT_EVENT_ALARM: i->inalarm = 1; res = get_alarms(i); ast_log(LOG_WARNING, "Detected alarm on channel %d: %s\n", i->channel, alarm2str(res)); + manager_event(EVENT_FLAG_SYSTEM, "Alarm", + "Alarm: %s\r\n" + "Channel: %d\r\n", + alarm2str(res), i->channel); /* fall thru intentionally */ - manager_event(EVENT_FLAG_SYSTEM, "Alarm", - "Alarm: %s\r\n" - "Channel: %d\r\n", - alarm2str(res), i->channel); case ZT_EVENT_ONHOOK: if (i->radio) break; /* Back on hook. Hang up. */ |