Changeset 415

Show
Ignore:
Timestamp:
12/20/07 10:33:28 (1 year ago)
Author:
gbooker
Message:

When loading a subdir, the timer is set in the wrong object. Use correct object to store timer.
Fixes #47

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/SapphireMetaData.m

    r414 r415  
    11661166} 
    11671167 
    1168 - (void)loadMetaData 
    1169 { 
    1170         [[NSNotificationCenter defaultCenter] postNotificationName:META_DATA_FILE_INFO_STARTED_LOADING object:self]; 
     1168- (void)internalLoadMetaData 
     1169{ 
    11711170        [loadTimer invalidate]; 
    11721171        loadTimer = [NSTimer scheduledTimerWithTimeInterval:0.0 target:self selector:@selector(loadMetaDataTimer:) userInfo:[NSMutableArray arrayWithObject:self] repeats:NO]; 
     1172} 
     1173 
     1174- (void)loadMetaData 
     1175{ 
     1176        [[NSNotificationCenter defaultCenter] postNotificationName:META_DATA_FILE_INFO_STARTED_LOADING object:self]; 
     1177        [self internalLoadMetaData]; 
    11731178} 
    11741179 
    …… 
    12081213        { 
    12091214                nextObj = [queue objectAtIndex:0]; 
    1210                 id nextTarget = self; 
    12111215                if([nextObj isKindOfClass:[SapphireDirectoryMetaData class]]) 
    1212                         nextTarget = nextObj; 
    1213                 loadTimer = [NSTimer scheduledTimerWithTimeInterval:0.0 target:nextTarget selector:@selector(loadMetaDataTimer:) userInfo:queue repeats:NO]; 
     1216                        [(SapphireDirectoryMetaData *)nextObj internalLoadMetaData]; 
     1217                else 
     1218                        loadTimer = [NSTimer scheduledTimerWithTimeInterval:0.0 target:self selector:@selector(loadMetaDataTimer:) userInfo:queue repeats:NO]; 
    12141219        } 
    12151220        else