Changeset 3690 for trunk/macosx/Controller.m

Timestamp:

Nov 2, 2007, 3:15:12 AM (15 years ago)

Author:

livings124

Message:

stop timers and notification checking on quit right away (real this time)

File:

• trunk/macosx/Controller.m (modified) (3 diffs)

trunk/macosx/Controller.m

@@ -529 +529 @@
 - (void) applicationWillTerminate: (NSNotification *) notification
 {
-    //remove all torrent downloads
-    if (fPendingTorrentDownloads)
-    {
-        NSEnumerator * downloadEnumerator = [[fPendingTorrentDownloads allValues] objectEnumerator];
-        NSDictionary * downloadDict;
-        NSURLDownload * download;
-        while ((downloadDict = [downloadEnumerator nextObject]))
-        {
-            download = [downloadDict objectForKey: @"Download"];
-            [download cancel];
-            [download release];
-        }
-        [fPendingTorrentDownloads removeAllObjects];
-    }
-    
-    //remove all remaining torrent files in the temporary directory
-    if (fTempTorrentFiles)
-    {
-        NSEnumerator * torrentEnumerator = [fTempTorrentFiles objectEnumerator];
-        NSString * path;
-        while ((path = [torrentEnumerator nextObject]))
-            [[NSFileManager defaultManager] removeFileAtPath: path handler: nil];
-        [fTempTorrentFiles removeAllObjects];
-    }
-    
-    //stop timers
+    //stop timers and notification checking
+    [[NSNotificationCenter defaultCenter] removeObserver: self];
+    
     [fTimer invalidate];
     [fSpeedLimitTimer invalidate];
@@ -564 +541 @@
     }
     
+    //remove all torrent downloads
+    if (fPendingTorrentDownloads)
+    {
+        NSEnumerator * downloadEnumerator = [[fPendingTorrentDownloads allValues] objectEnumerator];
+        NSDictionary * downloadDict;
+        NSURLDownload * download;
+        while ((downloadDict = [downloadEnumerator nextObject]))
+        {
+            download = [downloadDict objectForKey: @"Download"];
+            [download cancel];
+            [download release];
+        }
+        [fPendingTorrentDownloads removeAllObjects];
+    }
+    
+    //remove all remaining torrent files in the temporary directory
+    if (fTempTorrentFiles)
+    {
+        NSEnumerator * torrentEnumerator = [fTempTorrentFiles objectEnumerator];
+        NSString * path;
+        while ((path = [torrentEnumerator nextObject]))
+            [[NSFileManager defaultManager] removeFileAtPath: path handler: nil];
+        [fTempTorrentFiles removeAllObjects];
+    }
+    
     //remember window states and close all windows
     [fDefaults setBool: [[fInfoController window] isVisible] forKey: @"InfoVisible"];
@@ -595 +597 @@
     while ([startDate timeIntervalSinceNow] >= -5.0 && tr_handleStatus(fLib)->natTraversalStatus != TR_NAT_TRAVERSAL_DISABLED)
         usleep(100000);
-    
-    //remaining calls the same as dealloc
-    [[NSNotificationCenter defaultCenter] removeObserver: self];
     
     [fInfoController release];