Changeset 2123

Timestamp:

Jun 17, 2007, 6:17:43 AM (15 years ago)

Author:

livings124

Message:

fix a crash when canceling the creation

Location:

branches/file_selection/macosx

Files:

• CreatorWindowController.m (modified) (4 diffs)
• English.lproj/Creator.nib/info.nib (modified) (1 diff)
• English.lproj/Creator.nib/keyedobjects.nib (modified) (previous)
• StringAdditions.m (modified) (1 diff)

branches/file_selection/macosx/CreatorWindowController.m

@@ -32 +32 @@
 + (NSString *) chooseFile;
 - (void) locationSheetClosed: (NSSavePanel *) openPanel returnCode: (int) code contextInfo: (void *) info;
-- (void) checkProgress: (NSTimer *) timer;
+- (void) checkProgress;
 - (void) failureSheetClosed: (NSAlert *) alert returnCode: (int) code contextInfo: (void *) info;
 
@@ -176 +176 @@
                     [fPrivateCheck state] == NSOnState);
     
-    fTimer = [NSTimer scheduledTimerWithTimeInterval: 0.1 target: self selector: @selector(checkProgress:)
+    fTimer = [NSTimer scheduledTimerWithTimeInterval: 0.1 target: self selector: @selector(checkProgress)
                         userInfo: nil repeats: YES];
     [fTimer fire];
@@ -230 +230 @@
 }
 
-- (void) checkProgress: (NSTimer *) timer
+- (void) checkProgress
 {
     if (fInfo->isDone)
     {
-        [timer invalidate];
-        timer = nil;
+        [fTimer invalidate];
+        fTimer = nil;
         
         if ([[self window] attachedSheet])
@@ -243 +243 @@
         }
         
-        if (fInfo->failed && !fInfo->abortFlag)
-        {
-            NSAlert * alert = [[[NSAlert alloc] init] autorelease];
-            [alert addButtonWithTitle: NSLocalizedString(@"OK", "Create torrent -> failed -> button")];
-            [alert setMessageText: [NSString stringWithFormat: NSLocalizedString(@"Creation of \"%@\" failed.",
-                                            "Create torrent -> failed -> title"), [fLocation lastPathComponent]]];
-            [alert setInformativeText: NSLocalizedString(@"There was an error parsing the data file. "
-                                        "The torrent file was not created.", "Create torrent -> failed -> warning")];
-            [alert setAlertStyle: NSWarningAlertStyle];
-            
-            [alert beginSheetModalForWindow: [self window] modalDelegate: self
-                    didEndSelector: @selector(failureSheetClosed:returnCode:contextInfo:) contextInfo: nil];
-            return;
-        }
-        
-        #warning add to T
+        if (fInfo->failed)
+        {
+            if (!fInfo->abortFlag)
+            {
+                NSAlert * alert = [[[NSAlert alloc] init] autorelease];
+                [alert addButtonWithTitle: NSLocalizedString(@"OK", "Create torrent -> failed -> button")];
+                [alert setMessageText: [NSString stringWithFormat: NSLocalizedString(@"Creation of \"%@\" failed.",
+                                                "Create torrent -> failed -> title"), [fLocation lastPathComponent]]];
+                [alert setInformativeText: NSLocalizedString(@"There was an error parsing the data file. "
+                                            "The torrent file was not created.", "Create torrent -> failed -> warning")];
+                [alert setAlertStyle: NSWarningAlertStyle];
+                
+                [alert beginSheetModalForWindow: [self window] modalDelegate: self
+                        didEndSelector: @selector(failureSheetClosed:returnCode:contextInfo:) contextInfo: nil];
+                return;
+            }
+        }
+        else
+        {
+            #warning add to T
+        }
         
         [[self window] close];

branches/file_selection/macosx/English.lproj/Creator.nib/info.nib

@@ -9 +9 @@
         <key>IBOpenObjects</key>
         <array>
+                <integer>5</integer>
                 <integer>45</integer>
-                <integer>5</integer>
         </array>
         <key>IBSystem Version</key>

branches/file_selection/macosx/StringAdditions.m

@@ -48 +48 @@
         return [NSString stringWithFormat: NSLocalizedString(@"%lld bytes", "File size"), size];
 
-    float convertedSize = (float) size;
+    float convertedSize = (float)size;
     NSString * unit;
     if (size < 1048576)