[merged] MacGui: better validation for denoise settings.

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.10.x@6900 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/macosx/HBFilters.m b/macosx/HBFilters.m
index ac5fdac83c707d534ad22d044f03ab8e4ba6c2f1..fe6f442635bcdea1c41e3412f074633911a05c7a 100644 (file)
--- a/macosx/HBFilters.m
+++ b/macosx/HBFilters.m
@@ -222,9 +222,33 @@ static NSDictionary *_nlmeansTunesDict;
         else
         {
             // New format, read the values directly
-            self.denoise = preset[@"PictureDenoiseFilter"];
-            self.denoisePreset = preset[@"PictureDenoisePreset"];
-            self.denoiseTune = preset[@"PictureDenoiseTune"];
+            if ([[_denoiseTypesDict allValues] containsObject:preset[@"PictureDenoiseFilter"]])
+            {
+                self.denoise = preset[@"PictureDenoiseFilter"];
+            }
+            else
+            {
+                self.denoise = [[_denoiseTypesDict allValues] firstObject];
+            }
+
+            if ([[_denoisePresetsDict allValues] containsObject:preset[@"PictureDenoisePreset"]])
+            {
+                self.denoisePreset = preset[@"PictureDenoisePreset"];
+            }
+            else
+            {
+                self.denoisePreset = [[_denoisePresetsDict allValues] firstObject];
+            }
+
+            if ([[_nlmeansTunesDict allValues] containsObject:preset[@"PictureDenoiseTune"]])
+            {
+                self.denoiseTune = preset[@"PictureDenoiseTune"];
+            }
+            else
+            {
+                self.denoiseTune = [[_nlmeansTunesDict allKeys] firstObject];
+            }
+
             self.denoiseCustomString = preset[@"PictureDenoiseCustom"];
         }