cancel blocklist download when quitting; cleanup

diff --git a/macosx/BlocklistDownloader.h b/macosx/BlocklistDownloader.h
index 712a5b6787fffd2115e86ff3690237eb2688283a..efb39f2f2c961504e4e75c9d5c28936bd919f1a5 100644 (file)
--- a/macosx/BlocklistDownloader.h
+++ b/macosx/BlocklistDownloader.h
@@ -40,7 +40,9 @@
     long long fExpectedSize;
 }
 
-+ (BlocklistDownloader *) downloader: (tr_handle *) handle;
++ (BlocklistDownloader *) downloader: (tr_handle *) handle; //starts download if not already occuring
++ (BOOL) isRunning;
+
 - (void) setViewController: (BlocklistDownloaderViewController *) viewController;
 
 - (void) cancelDownload;

diff --git a/macosx/BlocklistDownloader.m b/macosx/BlocklistDownloader.m
index 0d08904cd9feeb6572e4067235595256ed13bd5d..792768f2907a700548d97f7115a1b4661751eaea 100644 (file)
--- a/macosx/BlocklistDownloader.m
+++ b/macosx/BlocklistDownloader.m
@@ -51,6 +51,11 @@ BlocklistDownloader * fDownloader = nil;
     return fDownloader;
 }
 
++ (BOOL) isRunning
+{
+    return fDownloader != nil;
+}
+
 - (void) setViewController: (BlocklistDownloaderViewController *) viewController
 {
     fViewController = viewController;

diff --git a/macosx/Controller.m b/macosx/Controller.m
index 52f4d08abdcf6f320538ca58c945fb666fb987a7..0995156040a26a9e6a7cb80be8a6df78652c4b25 100644 (file)
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -38,6 +38,7 @@
 #import "ButtonToolbarItem.h"
 #import "GroupToolbarItem.h"
 #import "ToolbarSegmentedCell.h"
+#import "BlocklistDownloader.h"
 #import "NSApplicationAdditions.h"
 #import "NSStringAdditions.h"
 #import "NSMenuAdditions.h"
@@ -559,7 +560,9 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
 
 - (void) applicationWillTerminate: (NSNotification *) notification
 {
-    #warning stop blocklist download
+    //stop blocklist download
+    if ([BlocklistDownloader isRunning])
+        [[BlocklistDownloader downloader: fLib] cancelDownload];
     
     //stop timers and notification checking
     [[NSNotificationCenter defaultCenter] removeObserver: self];