From dad21c4885a8bb3b5fa75cebe0e2f568ab83cb24 Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Fri, 30 Jan 2015 21:30:14 +0000
Subject: [PATCH] WinGui: Fix Denoise NlMeans Custom Option not showing.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6832 b64f7644-9d1e-0410-96f1-a4d463321fa5
---
.../HandBrakeInterop/Json/Factories/EncodeFactory.cs | 3 +--
.../HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs | 2 +-
win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs | 4 ++--
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Factories/EncodeFactory.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Factories/EncodeFactory.cs
index 123ecd6d6..19a5e047c 100644
--- 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;
string settings;
- if (job.Denoise == Denoise.hqdn3d
- && !string.IsNullOrEmpty(job.CustomDenoise))
+ if (!string.IsNullOrEmpty(job.CustomDenoise))
{
settings = job.CustomDenoise;
}
diff --git a/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs b/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs
index 34569f7d5..14c0dfc93 100644
--- a/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs
@@ -54,7 +54,7 @@ namespace HandBrakeWPF.Converters.Filters
if (denoiseChoice == Denoise.NLMeans)
{
- return new List<DenoisePreset> { DenoisePreset.Ultralight, DenoisePreset.Light, DenoisePreset.Medium, DenoisePreset.Strong };
+ return new List<DenoisePreset> { DenoisePreset.Ultralight, DenoisePreset.Light, DenoisePreset.Medium, DenoisePreset.Strong, DenoisePreset.Custom };
}
}
diff --git a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
index 84b649b21..93b5ad0d5 100644
--- 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);
// Show / Hide the Custom Control
- this.ShowDenoiseCustom = this.CurrentTask.Denoise == Denoise.hqdn3d && this.CurrentTask.DenoisePreset == DenoisePreset.Custom;
+ this.ShowDenoiseCustom = this.CurrentTask.DenoisePreset == DenoisePreset.Custom;
if (value != DenoisePreset.Custom) this.CustomDenoise = string.Empty;
this.NotifyOfPropertyChange(() => this.ShowDenoiseCustom);
this.NotifyOfPropertyChange(() => this.ShowDenoiseOptions);
@@ -471,7 +471,7 @@ namespace HandBrakeWPF.ViewModels
{
get
{
- return this.SelectedDenoise == Denoise.NLMeans;
+ return this.SelectedDenoise == Denoise.NLMeans && this.SelectedDenoisePreset != DenoisePreset.Custom;
}
}
--
2.40.0