Changeset 5030


Ignore:
Timestamp:
Feb 13, 2008, 7:33:04 PM (14 years ago)
Author:
livings124
Message:

hopefully fix a crash with the open window

Location:
trunk/macosx
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/macosx/AddWindowController.m

    r4716 r5030  
    201201    fTimer = nil;
    202202   
     203    [fFileController setTorrent: nil]; //avoid a crash when window tries to update
     204   
    203205    [fController askOpenConfirmed: self add: NO];
     206    return YES;
    204207}
    205208
     
    241244        [fTorrent trashTorrent];
    242245   
    243     //ensure last, since it releases this controller
    244     [fController askOpenConfirmed: self add: YES];
     246    [fFileController setTorrent: nil]; //avoid a crash when window tries to update
     247   
     248    [self close];
     249    [fController askOpenConfirmed: self add: YES]; //ensure last, since it releases this controller
    245250}
    246251
  • trunk/macosx/MessageWindowController.m

    r4660 r5030  
    117117        return;
    118118   
    119     NSMutableDictionary * message;
    120119    for (currentMessage = messages; currentMessage != NULL; currentMessage = currentMessage->next)
    121120    {
    122         message  = [NSMutableDictionary dictionaryWithObjectsAndKeys:
    123                     [NSString stringWithUTF8String: currentMessage->message], @"Message",
    124                     [NSDate dateWithTimeIntervalSince1970: currentMessage->when], @"Date",
    125                     [NSNumber numberWithInt: currentMessage->level], @"Level", nil];
     121        NSMutableDictionary * message  = [NSMutableDictionary dictionaryWithObjectsAndKeys:
     122                                        [NSString stringWithUTF8String: currentMessage->message], @"Message",
     123                                        [NSDate dateWithTimeIntervalSince1970: currentMessage->when], @"Date",
     124                                        [NSNumber numberWithInt: currentMessage->level], @"Level", nil];
    126125       
    127126        if (currentMessage->file != NULL)
Note: See TracChangeset for help on using the changeset viewer.