Changeset 2271

Timestamp:

Jul 1, 2007, 6:02:10 PM (16 years ago)

Author:

livings124

Message:

same as last commit, with different objects

Location:

trunk/macosx

Files:

• Controller.m (modified) (4 diffs)
• PrefsController.h (modified) (1 diff)
• PrefsController.m (modified) (2 diffs)

trunk/macosx/Controller.m

@@ -199 +199 @@
     [fIPCController release];
     
-    [fAutoImportedNames release];
+    if (fAutoImportedNames)
+        [fAutoImportedNames release];
     if (fPendingTorrentDownloads)
         [fPendingTorrentDownloads release];
@@ -443 +444 @@
     
     //auto importing
-    fAutoImportedNames = [[NSMutableArray alloc] init];
     [self checkAutoImportDirectory];
 }
@@ -2023 +2023 @@
     }
     
-    [fAutoImportedNames removeAllObjects];
+    if (fAutoImportedNames)
+        [fAutoImportedNames removeAllObjects];
     [self checkAutoImportDirectory];
 }
@@ -2041 +2042 @@
     //only check files that have not been checked yet
     NSMutableArray * newNames = [importedNames mutableCopy];
-    [newNames removeObjectsInArray: fAutoImportedNames];
+    
+    if (fAutoImportedNames)
+        [newNames removeObjectsInArray: fAutoImportedNames];
+    else
+        fAutoImportedNames = [[NSMutableArray alloc] init];
     [fAutoImportedNames setArray: importedNames];
     

trunk/macosx/PrefsController.h

@@ -35 +35 @@
     BOOL                    fHasLoaded;
     
-    NSToolbar               * fToolbar;
     IBOutlet NSView         * fGeneralView, * fTransfersView, * fBandwidthView, * fNetworkView;
     

trunk/macosx/PrefsController.m

@@ -115 +115 @@
     fHasLoaded = YES;
     
-    fToolbar = [[NSToolbar alloc] initWithIdentifier: @"Preferences Toolbar"];
-    [fToolbar setDelegate: self];
-    [fToolbar setAllowsUserCustomization: NO];
-    [[self window] setToolbar: fToolbar];
-    [fToolbar setDisplayMode: NSToolbarDisplayModeIconAndLabel];
-    [fToolbar setSizeMode: NSToolbarSizeModeRegular];
-
-    [fToolbar setSelectedItemIdentifier: TOOLBAR_GENERAL];
+    NSToolbar * toolbar = [[NSToolbar alloc] initWithIdentifier: @"Preferences Toolbar"];
+    [toolbar setDelegate: self];
+    [toolbar setAllowsUserCustomization: NO];
+    [toolbar setDisplayMode: NSToolbarDisplayModeIconAndLabel];
+    [toolbar setSizeMode: NSToolbarSizeModeRegular];
+    [[self window] setToolbar: toolbar];
+
+    [toolbar setSelectedItemIdentifier: TOOLBAR_GENERAL];
     [self setPrefView: nil];
     
@@ -638 +638 @@
     else
     {
+        NSToolbar * toolbar = [window toolbar];
+        NSString * itemIdentifier = [toolbar selectedItemIdentifier];
+        NSEnumerator * enumerator = [[toolbar items] objectEnumerator];
         NSToolbarItem * item;
-        NSEnumerator * enumerator = [[fToolbar items] objectEnumerator];
         while ((item = [enumerator nextObject]))
-            if ([[item itemIdentifier] isEqualToString: [fToolbar selectedItemIdentifier]])
+            if ([[item itemIdentifier] isEqualToString: itemIdentifier])
             {
                 [window setTitle: [item label]];