From 60c2ff2d734c752ff32409e732641205543a985d Mon Sep 17 00:00:00 2001 From: Richard Frith-MacDonald Date: Mon, 2 Feb 2015 09:24:54 +0000 Subject: [PATCH] fix error in last change git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/ec/trunk@38319 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 2 +- EcAlarmDestination.m | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e72645..3ca907d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2015-01-30 Richard Frith-Macdonald +2015-02-02 Richard Frith-Macdonald * EcAlarmDestination.m: When coalescing alarms, do not coalesce a clear with anything other than an earlier clear for the same event. diff --git a/EcAlarmDestination.m b/EcAlarmDestination.m index 5db1807..0d619bf 100644 --- a/EcAlarmDestination.m +++ b/EcAlarmDestination.m @@ -84,7 +84,11 @@ [_alarmQueue addObject: event]; if (NSNotFound != index) { - [_alarmQueue removeObjectAtIndex: index]; + event = [_alarmQueue objectAtIndex: index]; + if ([event perceivedSeverity] == EcAlarmSeverityCleared) + { + [_alarmQueue removeObjectAtIndex: index]; + } } } else