From 305675cc3bbec99893e6d38e55a8e0b18619efdf Mon Sep 17 00:00:00 2001
From: Mitchell Livingston <livings124@transmissionbt.com>
Date: Sun, 11 Mar 2007 22:12:01 +0000
Subject: [PATCH] tiny consistency changes

---
 macosx/PrefsController.h | 2 +-
 macosx/PrefsController.m | 6 +++---
 macosx/Torrent.m         | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/macosx/PrefsController.h b/macosx/PrefsController.h
index c9fe035b7..8a5b5fae8 100644
--- a/macosx/PrefsController.h
+++ b/macosx/PrefsController.h
@@ -32,7 +32,7 @@
     tr_handle_t * fHandle;
     
     NSUserDefaults          * fDefaults;
-    BOOL                    hasLoaded;
+    BOOL                    fHasLoaded;
     
     NSToolbar               * fToolbar;
     IBOutlet NSView         * fGeneralView, * fTransfersView, * fBandwidthView, * fNetworkView;
diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index 0f305869a..91f80e58b 100644
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -112,7 +112,7 @@
 
 - (void) awakeFromNib
 {
-    hasLoaded = YES;
+    fHasLoaded = YES;
     
     fToolbar = [[NSToolbar alloc] initWithIdentifier: @"Preferences Toolbar"];
     [fToolbar setDelegate: self];
@@ -342,7 +342,7 @@
 
 - (void) updateRatioStopField
 {
-    if (!hasLoaded)
+    if (!fHasLoaded)
         return;
     
     [fRatioStopField setFloatValue: [fDefaults floatForKey: @"RatioLimit"]];
@@ -363,7 +363,7 @@
 
 - (void) updateLimitFields
 {
-    if (!hasLoaded)
+    if (!fHasLoaded)
         return;
     
     [fUploadField setIntValue: [fDefaults integerForKey: @"UploadLimit"]];
diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index b48a3e56e..ceb44a43b 100644
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -1237,9 +1237,8 @@ static uint32_t kRed   = BE(0xFF6450FF), //255, 100, 80
     fOrderValue = orderValue ? [orderValue intValue] : tr_torrentCount(fLib) - 1;
     fError = NO;
     
-    NSString * fileType = fInfo->multifile ? NSFileTypeForHFSTypeCode('fldr') : [[self name] pathExtension];
-    fIcon = [[NSWorkspace sharedWorkspace] iconForFileType: fileType];
-    [fIcon retain];
+    fIcon = [[[NSWorkspace sharedWorkspace] iconForFileType: fInfo->multifile ? NSFileTypeForHFSTypeCode('fldr')
+                                                : [[self name] pathExtension]] retain];
     
     fIconFlipped = [fIcon copy];
     [fIconFlipped setFlipped: YES];