From 635878ad4aa4434faffd39215e65703b2677daf1 Mon Sep 17 00:00:00 2001 From: ritsuka Date: Fri, 13 Feb 2015 12:32:04 +0000 Subject: [PATCH] [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 --- macosx/HBFilters.m | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/macosx/HBFilters.m b/macosx/HBFilters.m index ac5fdac83..fe6f44263 100644 --- 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"]; } -- 2.40.0