Changeset 525

Show
Ignore:
Timestamp:
05/03/08 16:41:50 (8 months ago)
Author:
gbooker
Message:

Switched the timer to a once fire, then die. This is easier to manage in all cases.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/SapphireFrappliance/SapphireImporterDataMenu.m

    r516 r525  
    222222        max = [importItems count]; 
    223223        if(!canceled) 
    224                 importTimer = [NSTimer scheduledTimerWithTimeInterval:0.0f target:self selector:@selector(importNextItem:) userInfo:nil repeats:YES]; 
     224                importTimer = [NSTimer scheduledTimerWithTimeInterval:0.0f target:self selector:@selector(importNextItem:) userInfo:nil repeats:NO]; 
    225225} 
    226226 
    …… 
    295295- (void)importNextItem:(NSTimer *)timer 
    296296{ 
     297        [importTimer invalidate]; 
     298        importTimer = nil; 
    297299        if([importItems count]) 
    298300        { 
    …… 
    326328        if(current == max) 
    327329        { 
    328                 [importTimer invalidate]; 
    329                 importTimer = nil; 
    330330                [metaCollection writeMetaData]; 
    331331                /*Update display*/ 
    …… 
    338338                [SapphireFrontRowCompat renderScene:[self scene]]; 
    339339        } 
     340        else 
     341        { 
     342                importTimer = [NSTimer scheduledTimerWithTimeInterval:0.0f target:self selector:@selector(importNextItem:) userInfo:nil repeats:NO]; 
     343        } 
    340344} 
    341345 
    …… 
    360364        /*Kil lthe timer*/ 
    361365        suspended = YES; 
    362         [importTimer invalidate]; 
    363         importTimer = nil; 
    364366} 
    365367 
    …… 
    370372        /*Resume*/ 
    371373        suspended = NO; 
    372         importTimer = [NSTimer scheduledTimerWithTimeInterval:0.0f target:self selector:@selector(importNextItem:) userInfo:nil repeats:YES]; 
     374        importTimer = [NSTimer scheduledTimerWithTimeInterval:0.0f target:self selector:@selector(importNextItem:) userInfo:nil repeats:NO]; 
    373375} 
    374376