WinGui: Fix Denoise NlMeans Custom Option not showing.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6832 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Factories/EncodeFactory.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Factories/EncodeFactory.cs
index 123ecd6d658889a31ac128bc25ee786288be43d0..19a5e047c18ddb8b6a7267d2ef60cc678a382132 100644 (file)
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Factories/EncodeFactory.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Factories/EncodeFactory.cs
@@ -446,8 +446,7 @@ namespace HandBrake.Interop.Json.Factories
                     : hb_filter_ids.HB_FILTER_NLMEANS;\r
 \r
                 string settings;\r
-                if (job.Denoise == Denoise.hqdn3d\r
-                    && !string.IsNullOrEmpty(job.CustomDenoise))\r
+                if (!string.IsNullOrEmpty(job.CustomDenoise))\r
                 {\r
                     settings = job.CustomDenoise;\r
                 }\r

diff --git a/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs b/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs
index 34569f7d5e12ea610f876e70cf88c519222f77f4..14c0dfc93a78802f6837d3f69bf1422b87ebb2b6 100644 (file)
--- a/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs
@@ -54,7 +54,7 @@ namespace HandBrakeWPF.Converters.Filters
 \r
                 if (denoiseChoice == Denoise.NLMeans)\r
                 {\r
-                    return new List<DenoisePreset> { DenoisePreset.Ultralight, DenoisePreset.Light, DenoisePreset.Medium, DenoisePreset.Strong };\r
+                    return new List<DenoisePreset> { DenoisePreset.Ultralight, DenoisePreset.Light, DenoisePreset.Medium, DenoisePreset.Strong, DenoisePreset.Custom };\r
                 } \r
             }\r
 \r

diff --git a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
index 84b649b213d00b1705606901838c048b5e7b4e60..93b5ad0d5f74a8cf1c534283a8ef64abd0771d4e 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
@@ -423,7 +423,7 @@ namespace HandBrakeWPF.ViewModels
                 this.NotifyOfPropertyChange(() => this.SelectedDenoisePreset);\r
 \r
                 // Show / Hide the Custom Control\r
-                this.ShowDenoiseCustom = this.CurrentTask.Denoise == Denoise.hqdn3d && this.CurrentTask.DenoisePreset == DenoisePreset.Custom;\r
+                this.ShowDenoiseCustom = this.CurrentTask.DenoisePreset == DenoisePreset.Custom;\r
                 if (value != DenoisePreset.Custom) this.CustomDenoise = string.Empty;\r
                 this.NotifyOfPropertyChange(() => this.ShowDenoiseCustom);\r
                 this.NotifyOfPropertyChange(() => this.ShowDenoiseOptions);\r
@@ -471,7 +471,7 @@ namespace HandBrakeWPF.ViewModels
         {\r
             get\r
             {\r
-                return this.SelectedDenoise == Denoise.NLMeans;\r
+                return this.SelectedDenoise == Denoise.NLMeans && this.SelectedDenoisePreset != DenoisePreset.Custom;\r
             }\r
         }\r
 \r