Changeset 2284

Timestamp:

Jul 4, 2007, 6:14:58 PM (15 years ago)

Author:

livings124

Message:

make sure the windows are closed before removing torrents...avoids a crash-on-quit

Location:

trunk/macosx

Files:

• Controller.m (modified) (2 diffs)
• Torrent.m (modified) (1 diff)
• TorrentCell.h (modified) (1 diff)
• TorrentCell.m (modified) (2 diffs)

trunk/macosx/Controller.m

@@ -548 +548 @@
     }
     
+    //remember window states and close all windows
+    [fDefaults setBool: [[fInfoController window] isVisible] forKey: @"InfoVisible"];
+    [[NSApp windows] makeObjectsPerformSelector: @selector(close)];
+    [self showStatusBar: NO animate: NO];
+    [self showFilterBar: NO animate: NO];
+    
     //save history
     [self updateTorrentHistory];
@@ -562 +568 @@
     //disable NAT traversal
     tr_natTraversalEnable(fLib, 0);
-    
-    //remember window states and close all windows
-    [fDefaults setBool: [[fInfoController window] isVisible] forKey: @"InfoVisible"];
-    [[NSApp windows] makeObjectsPerformSelector: @selector(close)];
-    [self showStatusBar: NO animate: NO];
-    [self showFilterBar: NO animate: NO];
     
     //clear badge

trunk/macosx/Torrent.m

@@ -521 +521 @@
     NSMutableDictionary * info = [NSMutableDictionary dictionaryWithObjectsAndKeys:
                                     [self name], @"Name",
-                                    [NSNumber numberWithBool: [self isSeeding]], @"Seeding",
                                     [NSNumber numberWithFloat: [self progress]], @"Progress",
                                     [NSNumber numberWithFloat: (float)fStat->left/[self size]], @"Left",
                                     [NSNumber numberWithBool: [self isActive]], @"Active",
+                                    [NSNumber numberWithBool: [self isSeeding]], @"Seeding",
                                     [NSNumber numberWithBool: [self isChecking]], @"Checking",
                                     [NSNumber numberWithBool: [self isError]], @"Error", nil];

trunk/macosx/TorrentCell.h

@@ -32 +32 @@
 {
     NSImage * fErrorImage;
-    CTGradient * fWhiteGradient, * fGrayGradient, * fLightGrayGradient, * fLightGreenGradient,
-                * fGreenGradient, * fYellowGradient, * fBlueGradient, * fTransparentGradient;
+    CTGradient * fWhiteGradient, * fGrayGradient, * fLightGrayGradient, * fBlueGradient, * fDarkBlueGradient, 
+                * fGreenGradient, * fLightGreenGradient, * fDarkGreenGradient, * fYellowGradient, * fTransparentGradient;
     NSUserDefaults * fDefaults;
 }

trunk/macosx/TorrentCell.m

@@ -51 +51 @@
         fLightGrayGradient = [[CTGradient progressLightGrayGradient] retain];
         fBlueGradient = [[CTGradient progressBlueGradient] retain];
+        //fDarkBlueGradient = [[CTGradient progressDarkBlueGradient] retain];
         fGreenGradient = [[CTGradient progressGreenGradient] retain];
         fLightGreenGradient = [[CTGradient progressLightGreenGradient] retain];
+        //fDarkGreenGradient = [[CTGradient progressDarkGreenGradient] retain];
         fYellowGradient = [[CTGradient progressYellowGradient] retain];
         fTransparentGradient = [[CTGradient progressTransparentGradient] retain];
@@ -102 +104 @@
     }
     
-    if ([[info objectForKey: @"Checking"] boolValue])
-        [fYellowGradient fillRect: completeBounds angle: -90];
-    else if ([[info objectForKey: @"Seeding"] boolValue])
-    {
-        NSRect ratioBounds = completeBounds;
-        ratioBounds.size.width *= [[info objectForKey: @"ProgressStopRatio"] floatValue];
-        
-        if (ratioBounds.size.width < completeBounds.size.width)
-            [fLightGreenGradient fillRect: completeBounds angle: -90];
-        [fGreenGradient fillRect: ratioBounds angle: -90];
-    }
-    else if ([[info objectForKey: @"Active"] boolValue])
-        [fBlueGradient fillRect: completeBounds angle: -90];
+    if ([[info objectForKey: @"Active"] boolValue])
+    {
+        if ([[info objectForKey: @"Checking"] boolValue])
+            [fYellowGradient fillRect: completeBounds angle: -90];
+        else if ([[info objectForKey: @"Seeding"] boolValue])
+        {
+            NSRect ratioBounds = completeBounds;
+            ratioBounds.size.width *= [[info objectForKey: @"ProgressStopRatio"] floatValue];
+            
+            if (ratioBounds.size.width < completeBounds.size.width)
+                [fLightGreenGradient fillRect: completeBounds angle: -90];
+        }
+        else
+            [fBlueGradient fillRect: completeBounds angle: -90];
+    }
     else
         [fGrayGradient fillRect: completeBounds angle: -90];