Changeset 113 for trunk/Cocoa/Pester/Source/PSAlarmAlertController.m

Timestamp:

03/10/03 05:48:21 (21 years ago)

Author:

Nicholas Riley

Message:

PSTimer.m: Fix bug 15, leaking PSTimer from NSInvocation argument retention.

Read Me.rtfd: Updated release notes.

PSAlarm.[hm]: Removed obsolete comment. Changed 1m-59m times to
display without `0h'. Moved code from deserialization to -resetTimer
to be used for alarm deletion undo - fix bug 14.

PSAlarmsController.m: Fix bug 14 - implement _restoreAlarms:,
_removeAlarms and _undoManager. Need to add localized string.

PSAlarmAlertController.m: Fix bug 17, move alert triggering from
constructor to -performAlertsForAlarm: to avoid nested notifications
delivering in wrong order.

PSAlarms.[hm]: Fix bug 14 - implement -restoreAlarms, invokes [PSAlarm
resetTimer]. Clarified a comment. Uncommented some debug logging.

package-Pester.sh: Implemented partition map-less disk image, saves a
few K on distribution. Removed obsolete comments. Added agvtool
bump.

File:

• trunk/Cocoa/Pester/Source/PSAlarmAlertController.m (modified) (1 diff)

trunk/Cocoa/Pester/Source/PSAlarmAlertController.m

@@ -50 +50 @@
 }
 
+- (void)performAlertsForAlarm:(PSAlarm *)alarm;
+{
+    PSAlerts *alerts = [alarm alerts];
+    NSArray *allAlerts = [alerts allAlerts];
+    if ([allAlerts count] == 0) {
+        [self _resumeAlarm: alarm];
+    } else {
+        pendingAlerts = [[NSMutableSet alloc] init];
+        [pendingAlerts addObjectsFromArray: allAlerts];
+        [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(_alertCompleted:)
+                                                     name: PSAlarmAlertCompletedNotification object: alarm];
+        [self retain]; // release in _alertCompleted:
+    }
+    [alerts triggerForAlarm: alarm];
+    if ([alerts requirePesterFrontmost] && ![NSApp isActive]) { // restore frontmost process afterward
+        NSDictionary *activeProcessInfo = [[NSWorkspace sharedWorkspace] activeApplication];
+        frontmostApp.highLongOfPSN = [[activeProcessInfo objectForKey: @"NSApplicationProcessSerialNumberHigh"] longValue];
+        frontmostApp.lowLongOfPSN = [[activeProcessInfo objectForKey: @"NSApplicationProcessSerialNumberLow"] longValue];
+        appWasHidden = [NSApp isHidden];
+        [NSApp activateIgnoringOtherApps: YES];
+    }
+}
+
 - (id)initWithAlarm:(PSAlarm *)alarm;
 {
     if ( (self = [super init]) != nil) {
-        PSAlerts *alerts = [alarm alerts];
-        NSArray *allAlerts = [alerts allAlerts];
-        if ([allAlerts count] == 0) {
-            [self _resumeAlarm: alarm];
-        } else {
-            pendingAlerts = [[NSMutableSet alloc] init];
-            [pendingAlerts addObjectsFromArray: allAlerts];
-            [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(_alertCompleted:)
-                                                         name: PSAlarmAlertCompletedNotification object: alarm];
-            [self retain]; // release in _alertCompleted:
-        }
-        [alerts triggerForAlarm: alarm];
-        if ([alerts requirePesterFrontmost] && ![NSApp isActive]) { // restore frontmost process afterward
-            NSDictionary *activeProcessInfo = [[NSWorkspace sharedWorkspace] activeApplication];
-            frontmostApp.highLongOfPSN = [[activeProcessInfo objectForKey: @"NSApplicationProcessSerialNumberHigh"] longValue];
-            frontmostApp.lowLongOfPSN = [[activeProcessInfo objectForKey: @"NSApplicationProcessSerialNumberLow"] longValue];
-            appWasHidden = [NSApp isHidden];
-            [NSApp activateIgnoringOtherApps: YES];
-        }
+        // because we're called within a notification, and alerts may deliver further notifications, make sure the rest of the notification clients are able to execute first
+        [self performSelector: @selector(performAlertsForAlarm:) withObject: alarm afterDelay: 0];
     }
     return self;