Skip to content

Fix duplicate NSWorkspaceDidWakeNotification observations #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davidme-stripe wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix duplicate NSWorkspaceDidWakeNotification observations #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions UTCMenuClock/UTCMenuClockAppDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,10 +471,18 @@ - (void)awakeFromNib
[_mainMenu addItem:cp3Item];

[theItem setMenu:_mainMenu];

[self setupWakeNotifications];
[self scheduleTimer];
}

- (void)setupWakeNotifications
{
// https://developer.apple.com/library/archive/qa/qa1340/_index.html
[[[NSWorkspace sharedWorkspace] notificationCenter] addObserver: self
selector: @selector(receiveWakeNote:)
name: NSWorkspaceDidWakeNotification object: nil];
}

- (void)scheduleTimer {
// Invalidate and dealloc old timer
[_timer invalidate];
Expand Down Expand Up @@ -516,9 +524,6 @@ - (void)scheduleTimer {
tolerance = 0.5;
}

// Set up wake notifications to reset the timer after sleep
[self fileNotifications];

NSDate *startDateTime = [[NSCalendar currentCalendar] dateFromComponents:startUnits];
_timer = [[NSTimer alloc] initWithFireDate:startDateTime interval:interval target:self selector:@selector(fireTimer:) userInfo:nil repeats:YES];
_timer.tolerance = tolerance;
Expand All @@ -532,14 +537,6 @@ - (void)receiveWakeNote: (NSNotification*) note
// When the machine wakes from sleep, reset our timer to make sure we're still running on the second/minute
[self scheduleTimer];
}

- (void)fileNotifications
{
// https://developer.apple.com/library/archive/qa/qa1340/_index.html
[[[NSWorkspace sharedWorkspace] notificationCenter] addObserver: self
selector: @selector(receiveWakeNote:)
name: NSWorkspaceDidWakeNotification object: nil];
}

- (void)dealloc
{
Expand Down