Changeset 71

Show
Ignore:
Timestamp:
12/27/05 14:30:32 (3 years ago)
Author:
mrowe
Message:

Ensure -loadPreferences? does not leak tunnels when called a second time. TunnelsView? now also preserves the current tunnel selection across uses. Closes #32.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/PreferenceViews/TunnelsView.m

    r41 r71  
    1818                delDynamicPortForwardButton = nil; 
    1919        } 
    20 } 
    21  
    22 - (void)loadPreferences 
    23 { 
    24         /* Get all tunnels. */ 
    25         [[NSUserDefaults standardUserDefaults] synchronize]; 
    26         tunnels = [[NSMutableArray alloc] initWithArray: 
    27                                         [[NSUserDefaults standardUserDefaults] arrayForKey:TunnelsString]]; 
    28          
    29         if(!tunnels) { 
    30                 tunnels = [[NSMutableArray alloc] init]; 
    31         } 
    32  
     20         
    3321        tunnelIndex = -1; 
    34  
     22         
    3523        [tunnelTable setDataSource:self]; 
    3624        [remotePortForwardTable setDataSource:self]; 
    …… 
    3927} 
    4028 
     29- (void)loadPreferences 
     30{ 
     31        /* Get all tunnels. */ 
     32        [[NSUserDefaults standardUserDefaults] synchronize]; 
     33        [tunnels release]; 
     34        tunnels = [[[NSUserDefaults standardUserDefaults] arrayForKey:TunnelsString] mutableCopy]; 
     35        if (!tunnels) 
     36                tunnels = [[NSMutableArray alloc] init]; 
     37         
     38        [self updateUI]; 
     39} 
     40 
    4141- (void)closePreferences 
    4242{ 
    43         [tunnelTable deselectAll:self]; 
    44          
    4543        [self saveTunnelDetails]; 
    46         [self hideTunnelDetails]; 
    4744        [self savePreferences]; 
    4845}