0.10.x Porting Nlmeans Custom Fix

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

1 files changed, 3 insertions, 3 deletions

diff --git a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
index 019bf0418..8dd00b062 100644
--- a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
@@ -296,7 +296,7 @@ namespace HandBrakeWPF.ViewModels
                 this.NotifyOfPropertyChange(() => this.SelectedDenoise);

 

                 // Show / Hide the Custom Control

-                this.ShowDenoiseCustom = this.CurrentTask.Denoise == Denoise.hqdn3d && this.CurrentTask.DenoisePreset == DenoisePreset.Custom;

+                this.ShowDenoiseCustom = this.CurrentTask.DenoisePreset == DenoisePreset.Custom;

                 this.NotifyOfPropertyChange(() => this.ShowDenoiseCustom);

 

                 this.SelectedDenoisePreset = this.CurrentTask.Denoise == Denoise.hqdn3d ? DenoisePreset.Weak : DenoisePreset.Ultralight; // Default so we don't have an invalid preset.

@@ -417,7 +417,7 @@ namespace HandBrakeWPF.ViewModels
                 this.NotifyOfPropertyChange(() => this.SelectedDenoisePreset);

 

                 // Show / Hide the Custom Control

-                this.ShowDenoiseCustom = this.CurrentTask.Denoise == Denoise.hqdn3d && this.CurrentTask.DenoisePreset == DenoisePreset.Custom;

+                this.ShowDenoiseCustom = this.CurrentTask.DenoisePreset == DenoisePreset.Custom;

                 this.NotifyOfPropertyChange(() => this.ShowDenoiseCustom);

                 this.NotifyOfPropertyChange(() => this.ShowDenoiseOptions);

                 this.NotifyOfPropertyChange(() => this.ShowDenoiseTune);

@@ -464,7 +464,7 @@ namespace HandBrakeWPF.ViewModels
         {

             get

             {

-                return this.SelectedDenoise == Denoise.NLMeans;

+                return this.SelectedDenoise == Denoise.NLMeans && this.SelectedDenoisePreset != DenoisePreset.Custom;

             }

         }