2 files changed, 99 insertions, 0 deletions
diff --git a/win/CS/HandBrakeWPF/Converters/AdvancedVisibilityConverter.cs b/win/CS/HandBrakeWPF/Converters/AdvancedVisibilityConverter.cs
new file mode 100644
index 000000000..905d8798a
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Converters/AdvancedVisibilityConverter.cs
@@ -0,0 +1,94 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AdvancedVisibilityConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the AdvancedVisibilityConverter type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Converters
+{
+    using System;
+    using System.Globalization;
+    using System.Windows;
+    using System.Windows.Data;
+
+    /// <summary>
+    /// The advanced visibility converter.
+    /// </summary>
+    [Obsolete("This will be refactored out soon! Don't use.")]
+    public class AdvancedVisibilityConverter : IValueConverter
+    {
+        #region Implemented Interfaces
+
+        #region IValueConverter
+
+        /// <summary>
+        /// The convert.
+        /// </summary>
+        /// <param name="value">
+        /// The value.
+        /// </param>
+        /// <param name="targetType">
+        /// The target type.
+        /// </param>
+        /// <param name="parameter">
+        /// The parameter.
+        /// </param>
+        /// <param name="culture">
+        /// The culture.
+        /// </param>
+        /// <returns>
+        /// The convert.
+        /// </returns>
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            bool visibility = (bool)value;
+
+            // If we are given a parameter, reverse it
+            if (parameter != null)
+            {
+                visibility = !visibility;
+            }
+
+            return visibility ? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        /// <summary>
+        /// The convert back.
+        /// </summary>
+        /// <param name="value">
+        /// The value.
+        /// </param>
+        /// <param name="targetType">
+        /// The target type.
+        /// </param>
+        /// <param name="parameter">
+        /// The parameter.
+        /// </param>
+        /// <param name="culture">
+        /// The culture.
+        /// </param>
+        /// <returns>
+        /// The convert back.
+        /// </returns>
+        public object ConvertBack(
+            object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            Visibility visibility = (Visibility)value;
+            bool result = visibility == Visibility.Visible;
+
+            if (parameter != null)
+            {
+                result = !result;
+            }
+
+            return result;
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
+\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/Converters/BooleanToVisibilityConverter.cs b/win/CS/HandBrakeWPF/Converters/BooleanToVisibilityConverter.cs
index 81e12ddc8..31da7ed74 100644
--- a/win/CS/HandBrakeWPF/Converters/BooleanToVisibilityConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/BooleanToVisibilityConverter.cs
@@ -42,6 +42,11 @@ namespace HandBrakeWPF.Converters
             // Paramater is a boolean which inverts the output.
             var param = System.Convert.ToBoolean(parameter, CultureInfo.InvariantCulture);
 
+            if (value == null)
+            {
+                return Visibility.Collapsed;
+            }
+
             if (value is Boolean)
             {
                 if (param)