From 0554c3f3915e0102d5c50ce00c658b17316d028c Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Fri, 29 Jun 2007 21:13:55 +0000 Subject: [PATCH] fix #239: avoid a loop when trying to cancel adding a torrent in the choose location dialog --- macosx/Controller.m | 2 +- macosx/Torrent.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/macosx/Controller.m b/macosx/Controller.m index 543577a3c..da1a0299a 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -791,6 +791,7 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy return; } + [files removeObjectAtIndex: 0]; NSOpenPanel * panel = [NSOpenPanel openPanel]; [panel setPrompt: NSLocalizedString(@"Select", "Open torrent -> prompt")]; @@ -801,7 +802,6 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy [panel setMessage: [NSString stringWithFormat: NSLocalizedString(@"Select the download folder for \"%@\"", "Open torrent -> select destination folder"), [NSString stringWithUTF8String: info.name]]]; - [panel setMessage: @"Select the download folder "]; NSDictionary * dictionary = [[NSDictionary alloc] initWithObjectsAndKeys: [torrentPath retain], @"Path", files, @"Files", [NSNumber numberWithBool: delete], @"Delete", nil]; diff --git a/macosx/Torrent.m b/macosx/Torrent.m index a395cd896..52a0d5305 100644 --- a/macosx/Torrent.m +++ b/macosx/Torrent.m @@ -138,7 +138,6 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80 - (NSDictionary *) history { - #warning not all being stored NSMutableDictionary * history = [NSMutableDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithBool: fPublicTorrent], @"PublicCopy", [self hashString], @"TorrentHash", @@ -205,6 +204,7 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80 if (fPublicTorrentLocation) [fPublicTorrentLocation release]; + #warning look into tr_torrentRemoveSaved(fHandle); [fDateAdded release];