From d623624ce2e629679db6d6bdcc85615fe3327b15 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Mon, 1 Sep 2008 23:17:30 +0000 Subject: [PATCH] runs on Tiger again, although blocklist auto-update won't be reliable on Tiger --- macosx/BlocklistScheduler.m | 9 ++++++--- macosx/Controller.m | 7 ++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/macosx/BlocklistScheduler.m b/macosx/BlocklistScheduler.m index 9eeb4820e..bf18ae122 100644 --- a/macosx/BlocklistScheduler.m +++ b/macosx/BlocklistScheduler.m @@ -24,6 +24,7 @@ #import "BlocklistScheduler.h" #import "BlocklistDownloader.h" +#import "NSApplicationAdditions.h" //one minute delay before running after option is changed #define SMALL_DELAY 60 @@ -69,9 +70,11 @@ BlocklistScheduler * fScheduler = nil; fTimer = [[NSTimer alloc] initWithFireDate: useDate interval: 0 target: self selector: @selector(runUpdater) userInfo: nil repeats: NO]; - [[NSRunLoop mainRunLoop] addTimer: fTimer forMode: NSDefaultRunLoopMode]; - [[NSRunLoop mainRunLoop] addTimer: fTimer forMode: NSModalPanelRunLoopMode]; - [[NSRunLoop mainRunLoop] addTimer: fTimer forMode: NSEventTrackingRunLoopMode]; + //current run loop usually means a second update won't work + NSRunLoop * loop = [NSApp isOnLeopardOrBetter] ? [NSRunLoop mainRunLoop] : [NSRunLoop currentRunLoop]; + [loop addTimer: fTimer forMode: NSDefaultRunLoopMode]; + [loop addTimer: fTimer forMode: NSModalPanelRunLoopMode]; + [loop addTimer: fTimer forMode: NSEventTrackingRunLoopMode]; } - (void) cancelSchedule diff --git a/macosx/Controller.m b/macosx/Controller.m index d719ba06e..cfafa34c8 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -2435,9 +2435,10 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy fSpeedLimitTimer = [[NSTimer alloc] initWithFireDate: dateToUse interval: 0 target: self selector: @selector(autoSpeedLimit:) userInfo: [NSNumber numberWithBool: nextIsLimit] repeats: NO]; - [[NSRunLoop mainRunLoop] addTimer: fSpeedLimitTimer forMode: NSDefaultRunLoopMode]; - [[NSRunLoop mainRunLoop] addTimer: fSpeedLimitTimer forMode: NSModalPanelRunLoopMode]; - [[NSRunLoop mainRunLoop] addTimer: fSpeedLimitTimer forMode: NSEventTrackingRunLoopMode]; + NSRunLoop * loop = [NSApp isOnLeopardOrBetter] ? [NSRunLoop mainRunLoop] : [NSRunLoop currentRunLoop]; + [loop addTimer: fSpeedLimitTimer forMode: NSDefaultRunLoopMode]; + [loop addTimer: fSpeedLimitTimer forMode: NSModalPanelRunLoopMode]; + [loop addTimer: fSpeedLimitTimer forMode: NSEventTrackingRunLoopMode]; [fSpeedLimitTimer release]; } -- 2.40.0