[svn-commits] trunk r28592 - /trunk/channels/chan_zap.c

[svn-commits at lists.digium.com]

Author: russell
Date: Fri May 19 09:51:08 2006
New Revision: 28592

URL: http://svn.digium.com/view/asterisk?rev=28592&view=rev
Log:
fix up a patch that did not merge properly from 1.2 ... weird 
(issue #6866, flefoll)

Modified:
    trunk/channels/chan_zap.c

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?rev=28592&r1=28591&r2=28592&view=diff
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Fri May 19 09:51:08 2006
@@ -6495,18 +6495,18 @@
 	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. */