From 1f0b3462951e7e39df528b495c8870467d665ff9 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Fri, 2 Nov 2007 22:07:16 +0000 Subject: [PATCH] if the download finishes/becomes unfinished, keep trying to reset the time machine setting, and other miscellaneous cleanup --- macosx/Badger.h | 2 +- macosx/Badger.m | 5 +---- macosx/Controller.m | 1 + macosx/Torrent.m | 4 ++-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/macosx/Badger.h b/macosx/Badger.h index 703aedcea..6f9c01016 100644 --- a/macosx/Badger.h +++ b/macosx/Badger.h @@ -29,7 +29,7 @@ { tr_handle * fLib; - NSImage * fDockIcon, * fBadge, * fUploadBadge, * fDownloadBadge; + NSImage * fDockIcon, * fBadge, * fUploadBadge; NSDictionary * fAttributes; int fCompleted, fCompletedBadged; diff --git a/macosx/Badger.m b/macosx/Badger.m index ce1c31566..d9b3a649f 100644 --- a/macosx/Badger.m +++ b/macosx/Badger.m @@ -173,11 +173,8 @@ stringRect.origin.y += spaceBetween; } - if (!fDownloadBadge) - fDownloadBadge = [NSImage imageNamed: @"DownloadBadge"]; - //place badge and text - [fDownloadBadge compositeToPoint: badgeRect.origin operation: NSCompositeSourceOver]; + [[NSImage imageNamed: @"DownloadBadge"] compositeToPoint: badgeRect.origin operation: NSCompositeSourceOver]; [self badgeString: downloadRateString forRect: stringRect]; } diff --git a/macosx/Controller.m b/macosx/Controller.m index 92d721646..cc1e25460 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -592,6 +592,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi //wait for running transfers to stop and for NAT to be disabled (5 second timeout) NSDate * startDate = [NSDate date]; + #warning do this in tr_close? while ([startDate timeIntervalSinceNow] >= -5.0 && tr_handleStatus(fLib)->natTraversalStatus != TR_NAT_TRAVERSAL_DISABLED) usleep(100000); diff --git a/macosx/Torrent.m b/macosx/Torrent.m index 4a0f2f252..be19fb5d2 100644 --- a/macosx/Torrent.m +++ b/macosx/Torrent.m @@ -1631,7 +1631,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void * if ([NSApp isOnLeopardOrBetter]) { NSURL *url = [NSURL fileURLWithPath: [[self downloadFolder] stringByAppendingPathComponent: [self name]]]; - CSBackupSetItemExcluded((CFURLRef)url, false, false); + fNeedSetTimeMachine = CSBackupSetItemExcluded((CFURLRef)url, false, false) != noErr; } fStat = tr_torrentStat(fHandle); @@ -1643,7 +1643,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void * if ([NSApp isOnLeopardOrBetter]) { NSURL *url = [NSURL fileURLWithPath: [[self downloadFolder] stringByAppendingPathComponent: [self name]]]; - CSBackupSetItemExcluded((CFURLRef)url, true, false); + fNeedSetTimeMachine = CSBackupSetItemExcluded((CFURLRef)url, true, false) != noErr; } [[NSNotificationCenter defaultCenter] postNotificationName: @"TorrentRestartedDownloading" object: self];