Changeset 794 for trunk

Timestamp:

Aug 19, 2006, 10:18:39 PM (16 years ago)

Author:

livings124

Message:

Acquire lock before setting completed badge to help get rid of problem of the completed badge not clearing when the main window is given focus

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (1 diff)
• macosx/Badger.h (modified) (1 diff)
• macosx/Badger.m (modified) (4 diffs)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -258 +258 @@
                 4DCCBB3C09C3D71100D3CABF /* TorrentCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = TorrentCell.m; path = macosx/TorrentCell.m; sourceTree = "<group>"; };
                 4DCCBB3D09C3D71100D3CABF /* TorrentCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TorrentCell.h; path = macosx/TorrentCell.h; sourceTree = "<group>"; };
-                4DDBB71909E16BAE00284745 /* transmissioncli */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = transmissioncli; sourceTree = BUILT_PRODUCTS_DIR; };
+                4DDBB71909E16BAE00284745 /* transmissioncli */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = transmissioncli; sourceTree = BUILT_PRODUCTS_DIR; };
                 4DDBB71B09E16BF100284745 /* transmissioncli.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = transmissioncli.c; path = cli/transmissioncli.c; sourceTree = "<group>"; };
                 4DDFDD20099A5D8E00189D81 /* DownloadBadge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = DownloadBadge.png; path = macosx/Images/DownloadBadge.png; sourceTree = "<group>"; };

trunk/macosx/Badger.h

@@ -35 +35 @@
     NSDictionary    * fAttributes;
     
+    NSLock          * fLock;
+    
     int             fCompleted;
     BOOL            fSpeedShown;

trunk/macosx/Badger.m

@@ -57 +57 @@
         [stringShadow release];
         
+        fLock = [[NSLock alloc] init];
+        
         fCompleted = 0;
         fSpeedShown = NO;
@@ -69 +71 @@
     [fBadgedDockIcon release];
     [fAttributes release];
+    [fLock release];
 
     [super dealloc];
@@ -77 +80 @@
     NSImage * dockIcon = nil;
     NSSize iconSize = [fDockIcon size];
+
+    [fLock lock]; //acquire lock to ensure completed badge is accurate
 
     //set completed badge
@@ -112 +117 @@
         fCompleted = completed;
     }
+    
+    [fLock unlock];
 
     //set upload and download rate badges