Changeset 399 for trunk/SapphireMetaData.m

Timestamp:

12/15/07 03:28:38 (4 years ago)

Author:

gbooker

Message:

Quick timer audit. Should handle the crash log in #31 (which was reported in a leopard ticket as well even though the crash log was abviously not leopard related, and thus not the right ticket). If this crash log is not from the original poster, please post still.
Fixes #31

Files:

• trunk/SapphireMetaData.m (modified) (4 diffs)

trunk/SapphireMetaData.m

@@ -630 +630 @@
 - (void)dealloc
 {
+        [loadTimer invalidate];
+        [importTimer invalidate];
         [self postAllFilesRemoved];
         [importTimer invalidate];
@@ -1151 +1153 @@
 {
         [[NSNotificationCenter defaultCenter] postNotificationName:META_DATA_FILE_INFO_STARTED_LOADING object:self];
-        [NSTimer scheduledTimerWithTimeInterval:0.0 target:self selector:@selector(loadMetaDataTimer:) userInfo:[NSMutableArray arrayWithObject:self] repeats:NO];
+        [loadTimer invalidate];
+        loadTimer = [NSTimer scheduledTimerWithTimeInterval:0.0 target:self selector:@selector(loadMetaDataTimer:) userInfo:[NSMutableArray arrayWithObject:self] repeats:NO];
 }
 
@@ -1177 +1180 @@
 - (void)loadMetaDataTimer:(NSTimer *)timer
 {
+        loadTimer = nil;
         NSMutableArray *queue = [timer userInfo];
         id nextObj = [[queue objectAtIndex:0] retain];
@@ -1191 +1195 @@
                 if([nextObj isKindOfClass:[SapphireDirectoryMetaData class]])
                         nextTarget = nextObj;
-                [NSTimer scheduledTimerWithTimeInterval:0.0 target:nextTarget selector:@selector(loadMetaDataTimer:) userInfo:queue repeats:NO];
+                loadTimer = [NSTimer scheduledTimerWithTimeInterval:0.0 target:nextTarget selector:@selector(loadMetaDataTimer:) userInfo:queue repeats:NO];
         }
         else