]> granicus.if.org Git - handbrake/commitdiff
MacGui: fix NSSecureCoding for the HBSubtitles class.
authorDamiano Galassi <damiog@gmail.com>
Wed, 4 Jan 2017 18:42:21 +0000 (19:42 +0100)
committerDamiano Galassi <damiog@gmail.com>
Wed, 4 Jan 2017 18:42:21 +0000 (19:42 +0100)
macosx/HBCodingUtilities.h
macosx/HBSubtitles.m

index de50bfaf793e43cd7a3be0121cc301f313a18de8..17d188b7fbdfeadfb138788e51f3d0441a1c7db8 100644 (file)
@@ -21,6 +21,8 @@
 
 #define decodeCollectionOfObjects(x, cl, objectcl) x = [HBCodingUtilities decodeObjectOfClasses:[NSSet setWithObjects:[cl class], [objectcl class], nil] forKey:OBJC_STRINGIFY(x) decoder:decoder];
 
+#define decodeCollectionOfObjects2(x, cl, objectcl, objectcl2) x = [HBCodingUtilities decodeObjectOfClasses:[NSSet setWithObjects:[cl class], [objectcl class], [objectcl2 class], nil] forKey:OBJC_STRINGIFY(x) decoder:decoder];
+
 #define decodeObjectOrFail(x, class) x = [HBCodingUtilities decodeObjectOfClass:class forKey:OBJC_STRINGIFY(x) decoder:decoder]; if (x == nil) {NSLog(@"Failed to decode: %@", OBJC_STRINGIFY(x)); goto fail;}
 
 NS_ASSUME_NONNULL_BEGIN
index f1a31174b09423959b4bf7dad9fd02300034fee1..c98f9fcecfff64d5f74bce13c15d0c12399e8fde 100644 (file)
@@ -446,7 +446,7 @@ extern NSString *keySubTrackSrtFileURL;
     self = [super init];
 
     decodeInt(_container);
-    decodeCollectionOfObjects(_sourceTracks, NSArray, NSDictionary);
+    decodeCollectionOfObjects2(_sourceTracks, NSArray, NSDictionary, NSURL);
     decodeCollectionOfObjects(_tracks, NSMutableArray, HBSubtitlesTrack);
 
     for (HBSubtitlesTrack *track in _tracks)