]> granicus.if.org Git - handbrake/commitdiff
MacGui: do not call decodeObjectOfClasses:forKey: on 10.7, fix loading queue from...
authorDamiano Galassi <damiog@gmail.com>
Wed, 28 Dec 2016 08:11:55 +0000 (09:11 +0100)
committerDamiano Galassi <damiog@gmail.com>
Wed, 28 Dec 2016 08:11:55 +0000 (09:11 +0100)
macosx/HBDistributedArray.m

index 432e5cd29a6884b26e61c2f93948081808704499..8a9baef1dffdbaf5aec2aea15c77e01757ff1d8f 100644 (file)
@@ -199,14 +199,18 @@ NSString *HBDistributedArraWrittenToDisk = @"HBDistributedArraWrittenToDisk";
     NSMutableArray *jobsArray = nil;
     @try
     {
-        NSData *queue = [NSData dataWithContentsOfURL:self.fileURL];
-        NSKeyedUnarchiver *unarchiver = [[NSKeyedUnarchiver alloc] initForReadingWithData:queue];
-        if ([unarchiver respondsToSelector:@selector(requiresSecureCoding)])
+        if ([NSKeyedUnarchiver instancesRespondToSelector:@selector(requiresSecureCoding)])
         {
+            NSData *queue = [NSData dataWithContentsOfURL:self.fileURL];
+            NSKeyedUnarchiver *unarchiver = [[NSKeyedUnarchiver alloc] initForReadingWithData:queue];
             unarchiver.requiresSecureCoding = YES;
+            jobsArray = [unarchiver decodeObjectOfClasses:self.objectClasses forKey:NSKeyedArchiveRootObjectKey];
+            [unarchiver finishDecoding];
+        }
+        else
+        {
+            jobsArray = [NSKeyedUnarchiver unarchiveObjectWithFile:self.fileURL.path];
         }
-        jobsArray = [unarchiver decodeObjectOfClasses:self.objectClasses forKey:NSKeyedArchiveRootObjectKey];
-        [unarchiver finishDecoding];
     }
     @catch (NSException *exception)
     {