automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@31157 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index c167db2ba9a745295af71f551cc9831eff12a6c4..09b06aee0aecf3487159e743752bb75b06017810 100644 (file)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -6338,18 +6338,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. */