Changeset 9407

Timestamp:

Oct 25, 2009, 9:30:19 PM (13 years ago)

Author:

livings124

Message:

delay part of generating the message log text until after choosing a location

File:

• trunk/macosx/MessageWindowController.m (modified) (3 diffs)

trunk/macosx/MessageWindowController.m

@@ -315 +315 @@
     NSSortDescriptor * descriptor = [[[NSSortDescriptor alloc] initWithKey: @"Index" ascending: YES] autorelease];
     NSArray * descriptors = [[NSArray alloc] initWithObjects: descriptor, nil];
-    NSArray * sortedMessages = [fMessages sortedArrayUsingDescriptors: descriptors];
+    NSArray * sortedMessages = [[fMessages sortedArrayUsingDescriptors: descriptors] retain];
     [descriptors release];
-    
-    //create the text to output
-    NSMutableArray * messageStrings = [NSMutableArray arrayWithCapacity: [fMessages count]];
-    for (NSDictionary * message in sortedMessages)
-        [messageStrings addObject: [self stringForMessage: message]];
-    
-    NSString * fileString = [[messageStrings componentsJoinedByString: @"\n"] retain];
     
     NSSavePanel * panel = [NSSavePanel savePanel];
@@ -331 +324 @@
     [panel beginSheetForDirectory: nil file: NSLocalizedString(@"untitled", "Save log panel -> default file name")
             modalForWindow: [self window] modalDelegate: self
-            didEndSelector: @selector(writeToFileSheetClosed:returnCode:contextInfo:) contextInfo: fileString];
-}
-
-- (void) writeToFileSheetClosed: (NSSavePanel *) panel returnCode: (NSInteger) code contextInfo: (NSString *) string
+            didEndSelector: @selector(writeToFileSheetClosed:returnCode:contextInfo:) contextInfo: sortedMessages];
+}
+
+- (void) writeToFileSheetClosed: (NSSavePanel *) panel returnCode: (NSInteger) code contextInfo: (NSArray *) messages
 {
     if (code == NSOKButton)
     {
-        if (![string writeToFile: [panel filename] atomically: YES encoding: NSUTF8StringEncoding error: nil])
+        //create the text to output
+        NSMutableArray * messageStrings = [NSMutableArray arrayWithCapacity: [fMessages count]];
+        for (NSDictionary * message in messages)
+            [messageStrings addObject: [self stringForMessage: message]];
+    
+        NSString * fileString = [messageStrings componentsJoinedByString: @"\n"];
+        
+        if (![fileString writeToFile: [panel filename] atomically: YES encoding: NSUTF8StringEncoding error: nil])
         {
             NSAlert * alert = [[NSAlert alloc] init];
@@ -353 +353 @@
     }
     
-    [string release];
+    [messages release];
 }