WinGui: Additional Error Handling in EnumHelper

diff --git a/win/CS/HandBrakeWPF/Utilities/EnumHelper.cs b/win/CS/HandBrakeWPF/Utilities/EnumHelper.cs
index c4ceaeb9483dfbbe23abf29f44242f1cbde4bb9a..718533aab0ace83e52181aae91ca1494e09776fd 100644 (file)
--- a/win/CS/HandBrakeWPF/Utilities/EnumHelper.cs
+++ b/win/CS/HandBrakeWPF/Utilities/EnumHelper.cs
@@ -44,10 +44,15 @@ namespace HandBrakeWPF.Utilities
             }
 
             FieldInfo fieldInfo = value.GetType().GetField(value.ToString());
-            DescriptionAttribute[] attributes =
+            if (fieldInfo != null)
+            {
+                DescriptionAttribute[] attributes =
                   (DescriptionAttribute[])fieldInfo.GetCustomAttributes(
                   typeof(DescriptionAttribute), false);
-            return (attributes.Length > 0) ? attributes[0].Description : value.ToString();
+                return (attributes.Length > 0) ? attributes[0].Description : value.ToString();
+            }
+
+            return string.Empty;
         }
 
         /// <summary>
@@ -63,9 +68,14 @@ namespace HandBrakeWPF.Utilities
             }
 
             FieldInfo fieldInfo = value.GetType().GetField(value.ToString());
-            DisplayName[] attributes = (DisplayName[])fieldInfo.GetCustomAttributes(typeof(DisplayName), false);
+            if (fieldInfo != null)
+            {
+                DisplayName[] attributes = (DisplayName[])fieldInfo.GetCustomAttributes(typeof(DisplayName), false);
+
+                return (attributes.Length > 0) ? attributes[0].Name : value.ToString();
+            }
 
-            return (attributes.Length > 0) ? attributes[0].Name : value.ToString();
+            return string.Empty;
         }
 
         /// <summary>
@@ -124,9 +134,13 @@ namespace HandBrakeWPF.Utilities
             }
 
             FieldInfo fieldInfo = value.GetType().GetField(value.ToString());
-            ShortName[] attributes = (ShortName[])fieldInfo.GetCustomAttributes(typeof(ShortName), false);
+            if (fieldInfo != null)
+            {
+                ShortName[] attributes = (ShortName[])fieldInfo.GetCustomAttributes(typeof(ShortName), false);
+                return (attributes.Length > 0) ? attributes[0].Name : value.ToString();
+            }
 
-            return (attributes.Length > 0) ? attributes[0].Name : value.ToString(); 
+            return string.Empty;
         }
 
         /// <summary>
@@ -153,7 +167,10 @@ namespace HandBrakeWPF.Utilities
         {
             var strings = new Collection<string>();
             foreach (T e in Enum.GetValues(enumType))
+            {
                 strings.Add(GetDisplay(e));
+            }
+
             return strings;
         }