From db160766e46666d439bb132ab9d5e7c68ad6bfae Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Mon, 28 Jan 2008 14:06:02 +0000 Subject: [PATCH] fix a crash when removing torrents when showing groups --- macosx/Controller.m | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/macosx/Controller.m b/macosx/Controller.m index 9a7b4a7d4..bc43f495d 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -1164,7 +1164,6 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi [torrent setWaitToStart: NO]; [fTorrents removeObjectsInArray: torrents]; - [fDisplayedTorrents removeObjectsInArray: torrents]; int lowestOrderValue = INT_MAX; enumerator = [torrents objectEnumerator]; @@ -2242,17 +2241,17 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi - (void) setLimitGlobalEnabled: (id) sender { - [fDefaults setBool: sender == ([sender menu] == fUploadMenu ? fUploadLimitItem : fDownloadLimitItem) - forKey: [sender menu] == fUploadMenu ? @"CheckUpload" : @"CheckDownload"]; + BOOL upload = [sender menu] == fUploadMenu; + [fDefaults setBool: sender == (upload ? fUploadLimitItem : fDownloadLimitItem) forKey: upload ? @"CheckUpload" : @"CheckDownload"]; [fPrefsController applySpeedSettings: nil]; } - (void) setQuickLimitGlobal: (id) sender { - [fDefaults setInteger: [[sender representedObject] intValue] forKey: [sender menu] == fUploadMenu - ? @"UploadLimit" : @"DownloadLimit"]; - [fDefaults setBool: YES forKey: [sender menu] == fUploadMenu ? @"CheckUpload" : @"CheckDownload"]; + BOOL upload = [sender menu] == fUploadMenu; + [fDefaults setInteger: [[sender representedObject] intValue] forKey: upload ? @"UploadLimit" : @"DownloadLimit"]; + [fDefaults setBool: YES forKey: upload ? @"CheckUpload" : @"CheckDownload"]; [fPrefsController updateLimitFields]; [fPrefsController applySpeedSettings: nil];