summaryrefslogtreecommitdiffstats
path: root/macosx/HBDistributedArray.m
diff options
context:
space:
mode:
authorritsuka <[email protected]>2015-02-20 12:15:41 +0000
committerritsuka <[email protected]>2015-02-20 12:15:41 +0000
commit1f5f8c44eb5adada531f7389334526497d1958f7 (patch)
treea724145e1d5df0a0a7a612ef822508bccac06362 /macosx/HBDistributedArray.m
parent18d100c00bf3326db87668b35f236df335c56824 (diff)
MacGui: remove the Queue directory in the Application Support folder, we don't use FSEvent anymore so it's not needed. Simplify the init of HBDistributedArray.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6931 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx/HBDistributedArray.m')
-rw-r--r--macosx/HBDistributedArray.m21
1 files changed, 7 insertions, 14 deletions
diff --git a/macosx/HBDistributedArray.m b/macosx/HBDistributedArray.m
index 56505ab1d..aef8dc4be 100644
--- a/macosx/HBDistributedArray.m
+++ b/macosx/HBDistributedArray.m
@@ -78,16 +78,6 @@ NSString *HBDistributedArraWrittenToDisk = @"HBDistributedArraWrittenToDisk";
_fileURL = [fileURL copy];
_array = [[NSMutableArray alloc] init];
- NSFileManager *fileManager = [NSFileManager defaultManager];
- if (![fileManager fileExistsAtPath:_fileURL.path])
- {
- if (![fileManager fileExistsAtPath:_fileURL.URLByDeletingLastPathComponent.path])
- {
- [fileManager createDirectoryAtPath:_fileURL.URLByDeletingLastPathComponent.path withIntermediateDirectories:YES attributes:nil error:NULL];
- }
- [fileManager createFileAtPath:_fileURL.path contents:nil attributes:nil];
- }
-
NSArray *runningInstances = [NSRunningApplication runningApplicationsWithBundleIdentifier:[[NSBundle mainBundle] bundleIdentifier]];
const char *name = [NSString stringWithFormat:@"/%@.hblock", _fileURL.lastPathComponent].UTF8String;
@@ -109,10 +99,13 @@ NSString *HBDistributedArraWrittenToDisk = @"HBDistributedArraWrittenToDisk";
[[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(handleNotification:) name:HBDistributedArraWrittenToDisk object:nil];
- // Load the array from disk
- [self lock];
- [self reload];
- [self unlock];
+ if ([[NSFileManager defaultManager] fileExistsAtPath:_fileURL.path])
+ {
+ // Load the array from disk
+ [self lock];
+ [self reload];
+ [self unlock];
+ }
}
return self;