Changeset 13249

Timestamp:

Mar 10, 2012, 1:36:26 PM (9 years ago)

Author:

livings124

Message:

less crashing with ARC

Location:

trunk/macosx

Files:

• BlocklistDownloaderViewController.m (modified) (3 diffs)
• BonjourController.m (modified) (1 diff)
• PeerProgressIndicatorCell.m (modified) (2 diffs)
• ProgressGradients.m (modified) (1 diff)
• TorrentTableView.m (modified) (1 diff)

trunk/macosx/BlocklistDownloaderViewController.m

@@ -38 +38 @@
 @implementation BlocklistDownloaderViewController
 
-#warning make gcd singleton
+#warning make gcd singleton?
+BlocklistDownloaderViewController * fDLViewController = nil;
 + (void) downloadWithPrefsController: (PrefsController *) prefsController
 {
-    BlocklistDownloaderViewController * downloader = [[BlocklistDownloaderViewController alloc] initWithPrefsController: prefsController];
-    [downloader startDownload];
+    if (!fDLViewController)
+    {
+        fDLViewController = [[BlocklistDownloaderViewController alloc] initWithPrefsController: prefsController];
+        [fDLViewController startDownload];
+    }
 }
 
@@ -103 +107 @@
     [fStatusWindow orderOut: self];
     
+    fDLViewController = nil;
 }
 
@@ -149 +154 @@
 {
     [[alert window] orderOut: self];
+    
+    fDLViewController = nil;
 }
 

trunk/macosx/BonjourController.m

@@ -27 +27 @@
 @implementation BonjourController
 
-#warning make gcd singleton
 BonjourController * fDefaultController = nil;
 + (BonjourController *) defaultController
 {
-    if (!fDefaultController)
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
         fDefaultController = [[BonjourController alloc] init];
+    });
+    
     return fDefaultController;
 }

trunk/macosx/PeerProgressIndicatorCell.m

@@ -26 +26 @@
 #import "NSStringAdditions.h"
 
-#import "transmission.h" // required by utils.h
-#import "utils.h"
-
 @implementation PeerProgressIndicatorCell
 
@@ -54 +51 @@
     {
         //attributes not needed anymore
-        if (fAttributes)
-        {
-            fAttributes = nil;
-        }
+        fAttributes = nil;
         
         [super drawWithFrame: cellFrame inView: controlView];

trunk/macosx/ProgressGradients.m

@@ -39 +39 @@
                         alpha: alpha];
     
-    NSGradient * progressGradient = [[NSGradient alloc] initWithColorsAndLocations: baseColor, 0.0, color2, 0.5, color3, 0.5,
-                                        baseColor, 1.0, nil];
-    return progressGradient;
+    return [[NSGradient alloc] initWithColorsAndLocations: baseColor, 0.0, color2, 0.5, color3, 0.5, baseColor, 1.0, nil];
 }
 

trunk/macosx/TorrentTableView.m

@@ -90 +90 @@
 {
     [[NSNotificationCenter defaultCenter] removeObserver: self];
-    
-    
-    
-    
-    
 }