Changeset 13323

Timestamp:

May 28, 2012, 7:43:53 PM (9 years ago)

Author:

livings124

Message:

#4923 "Open when created" might not be respected

Location:

trunk/macosx

Files:

• CreatorWindowController.h (modified) (1 diff)
• CreatorWindowController.m (modified) (7 diffs)

trunk/macosx/CreatorWindowController.h

@@ -44 +44 @@
     
     NSTimer * fTimer;
-    BOOL fStarted;
+    BOOL fStarted, fOpenWhenCreated;
     
     NSUserDefaults * fDefaults;

trunk/macosx/CreatorWindowController.m

@@ -37 +37 @@
 + (NSURL *) chooseFile;
 
+- (void) updateLocationField;
 - (void) createBlankAddressAlertDidEnd: (NSAlert *) alert returnCode: (NSInteger) returnCode contextInfo: (void *) contextInfo;
 - (void) createReal;
@@ -184 +185 @@
         fLocation = [[NSURL alloc] initFileURLWithPath: [[location stringByExpandingTildeInPath] stringByAppendingPathComponent: [name stringByAppendingPathExtension: @"torrent"]]];
     }
-    NSString * pathString = [fLocation path];
-    [fLocationField setStringValue: [pathString stringByAbbreviatingWithTildeInPath]];
-    [fLocationField setToolTip: pathString];
+    [self updateLocationField];
     
     //set previously saved values
@@ -235 +234 @@
 - (void) window: (NSWindow *) window didDecodeRestorableState: (NSCoder *) coder
 {
-    #warning done in 3 places - make a separate method
     [fLocation release];
     fLocation = [[coder decodeObjectForKey: @"TRCreatorLocation"] retain];
-    NSString * pathString = [fLocation path];
-    [fLocationField setStringValue: [pathString stringByAbbreviatingWithTildeInPath]];
-    [fLocationField setToolTip: pathString];
+    [self updateLocationField];
     
     [fTrackers release];
@@ -270 +266 @@
             [fLocation release];
             fLocation = [[panel URL] retain];
-            
-            NSString * pathString = [fLocation path];
-            [fLocationField setStringValue: [pathString stringByAbbreviatingWithTildeInPath]];
-            [fLocationField setToolTip: pathString];
+            [self updateLocationField];
         }
     }];
@@ -453 +446 @@
 
 @implementation CreatorWindowController (Private)
+
+- (void) updateLocationField
+{
+    NSString * pathString = [fLocation path];
+    [fLocationField setStringValue: [pathString stringByAbbreviatingWithTildeInPath]];
+    [fLocationField setToolTip: pathString];
+}
 
 + (NSURL *) chooseFile
@@ -540 +540 @@
     [fDefaults setBool: [fPrivateCheck state] == NSOnState forKey: @"CreatorPrivate"];
     [fDefaults setBool: [fOpenCheck state] == NSOnState forKey: @"CreatorOpen"];
+    fOpenWhenCreated = [fOpenCheck state] == NSOnState; //need this since the check box might not exist, and value in prefs might have changed from another creator window
     [fDefaults setURL: [fLocation URLByDeletingLastPathComponent] forKey: @"CreatorLocationURL"];
     
     [[NSNotificationCenter defaultCenter] postNotificationName: @"BeginCreateTorrentFile" object: fLocation userInfo: nil];
-    tr_makeMetaInfo(fInfo, [[fLocation path] UTF8String], trackerInfo, [fTrackers count], [[fCommentView string] UTF8String],
-                    [fPrivateCheck state] == NSOnState);
+    tr_makeMetaInfo(fInfo, [[fLocation path] UTF8String], trackerInfo, [fTrackers count], [[fCommentView string] UTF8String], [fPrivateCheck state] == NSOnState);
     tr_free(trackerInfo);
     
@@ -562 +562 @@
         {
             case TR_MAKEMETA_OK:
-                #warning this isn't safe - what if another window changes it after hitting the create button on this window?
-                if ([fDefaults boolForKey: @"CreatorOpen"])
+                if (fOpenWhenCreated)
                 {
                     NSDictionary * dict = [[NSDictionary alloc] initWithObjectsAndKeys: [fLocation path], @"File",