Some more work on environments...

2 files changed, 9 insertions, 2 deletions

diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/EnumToDescriptionConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/EnumToDescriptionConverter.cs
index 797d5c2e4..d907595de 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Converters/EnumToDescriptionConverter.cs
+++ b/Software/Visual_Studio/Tango.SharedUI/Converters/EnumToDescriptionConverter.cs
@@ -28,7 +28,14 @@ namespace Tango.SharedUI.Converters
         /// <exception cref="System.NotImplementedException"></exception>
         public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
-            return GetDescription(value, value.ToString());
+            if (value != null)
+            {
+                return GetDescription(value, value.ToString());
+            }
+            else
+            {
+                return null;
+            }
         }
 
         public static string GetDescription(object enumValue, string defDesc)
diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/IsEqualConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/IsEqualConverter.cs
index 4d3563681..c5de0a83f 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Converters/IsEqualConverter.cs
+++ b/Software/Visual_Studio/Tango.SharedUI/Converters/IsEqualConverter.cs
@@ -14,7 +14,7 @@ namespace Tango.SharedUI.Converters
         {
             if (values != null && values.Length > 0)
             {
-                return values.All(x => x == values.First());
+                return values.All(x => x.Equals(values.First()));
             }
 
             return false;