1 files changed, 53 insertions, 0 deletions
diff --git a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
index 4dd88f6be..7cb50ac37 100644
--- a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
@@ -216,6 +216,17 @@ namespace HandBrakeWPF.ViewModels
         }
 
         /// <summary>
+        /// Comb Detection Presets
+        /// </summary>
+        public IEnumerable<CombDetect> CombDetectPresets
+        {
+            get
+            {
+                return EnumHelper<CombDetect>.GetEnumList();
+            }
+        }
+
+        /// <summary>
         /// Gets or sets a value indicating whether Grayscale.
         /// </summary>
         public bool Grayscale
@@ -256,6 +267,48 @@ namespace HandBrakeWPF.ViewModels
             }
         }
 
+        public CombDetect SelectedCombDetectPreset
+        {
+            get
+            {
+                return this.CurrentTask.CombDetect;
+            }
+
+            set
+            {
+                this.CurrentTask.CombDetect = value;
+                this.NotifyOfPropertyChange(() => this.SelectedCombDetectPreset);
+
+                // Show / Hide the Custom Control
+                this.NotifyOfPropertyChange(() => this.ShowCombDetectCustom);
+            }
+        }
+
+        /// <summary>
+        /// Show the CombDetect Custom Box.
+        /// </summary>
+        public bool ShowCombDetectCustom
+        {
+            get
+            {
+                return this.SelectedCombDetectPreset == CombDetect.Custom;
+            }
+        }
+
+        public string CustomCombDetect
+        {
+            get
+            {
+                return this.CurrentTask.CustomCombDetect;
+            }
+
+            set
+            {
+                this.CurrentTask.CustomCombDetect = value;
+                this.NotifyOfPropertyChange(() => this.CustomCombDetect);
+            }
+        }
+
         /// <summary>
         /// Gets or sets SelectedDecomb.
         /// </summary>