From: Damiano Galassi <damiog@gmail.com>
Date: Wed, 4 Jan 2017 18:42:21 +0000 (+0100)
Subject: MacGui: fix NSSecureCoding for the HBSubtitles class.
X-Git-Tag: 1.1.0~809
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=557a67c170c1c2c5ef275b9e91e5facc97ecaa39;p=handbrake

MacGui: fix NSSecureCoding for the HBSubtitles class.
---

diff --git a/macosx/HBCodingUtilities.h b/macosx/HBCodingUtilities.h
index de50bfaf7..17d188b7f 100644
--- a/macosx/HBCodingUtilities.h
+++ b/macosx/HBCodingUtilities.h
@@ -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
diff --git a/macosx/HBSubtitles.m b/macosx/HBSubtitles.m
index f1a31174b..c98f9fcec 100644
--- a/macosx/HBSubtitles.m
+++ b/macosx/HBSubtitles.m
@@ -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)