From 32048e7417bd6e68785441cb8223f8b2066fcdf6 Mon Sep 17 00:00:00 2001
From: Mitchell Livingston <livings124@transmissionbt.com>
Date: Sun, 6 May 2007 23:45:28 +0000
Subject: [PATCH] better retain/release/invalidate the auto-import timer

---
 macosx/Controller.m | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/macosx/Controller.m b/macosx/Controller.m
index b99b0a5d0..2da49cb0b 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -504,9 +504,9 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
     [fPendingTorrentDownloads removeAllObjects];
     
     //stop timers
-    [fSpeedLimitTimer invalidate];
     [fTimer invalidate];
-    if (fAutoImportTimer)
+    [fSpeedLimitTimer invalidate];
+    if (fAutoImportTimer && [fAutoImportTimer isValid])
         [fAutoImportTimer invalidate];
     
     //save history and stop running torrents
@@ -1841,26 +1841,20 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
     if (![fDefaults boolForKey: @"AutoImport"])
         return;
     
-    if (fAutoImportTimer)
-    {
+    if (fAutoImportTimer && [fAutoImportTimer isValid])
         [fAutoImportTimer invalidate];
-        fAutoImportTimer = nil;
-    }
     
     //check again in 10 seconds in case torrent file wasn't complete
-    fAutoImportTimer = [NSTimer scheduledTimerWithTimeInterval: 10.0 target: self 
-        selector: @selector(checkAutoImportDirectory) userInfo: nil repeats: NO];
+    fAutoImportTimer = [[NSTimer scheduledTimerWithTimeInterval: 10.0 target: self 
+        selector: @selector(checkAutoImportDirectory) userInfo: nil repeats: NO] retain];
     
     [self checkAutoImportDirectory];
 }
 
 - (void) changeAutoImport
 {
-    if (fAutoImportTimer)
-    {
+    if (fAutoImportTimer && [fAutoImportTimer isValid])
         [fAutoImportTimer invalidate];
-        fAutoImportTimer = nil;
-    }
     
     [fAutoImportedNames removeAllObjects];
     [self checkAutoImportDirectory];
@@ -1870,7 +1864,7 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
 {
     if (![fDefaults boolForKey: @"AutoImport"])
         return;
-        
+    NSLog(@"checking");
     NSString * path = [[fDefaults stringForKey: @"AutoImportDirectory"] stringByExpandingTildeInPath];
     
     NSArray * importedNames;