WinGui: Some further work removing duplicate models, updating the libscan/encode services, fixes to the EnumHelper

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4215 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 3 insertions, 2 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Functions/EnumHelper.cs b/win/CS/HandBrake.ApplicationServices/Functions/EnumHelper.cs
index 53d7f6069..ad565f0b7 100644
--- a/win/CS/HandBrake.ApplicationServices/Functions/EnumHelper.cs
+++ b/win/CS/HandBrake.ApplicationServices/Functions/EnumHelper.cs
@@ -41,7 +41,7 @@ namespace HandBrake.ApplicationServices.Functions
         /// </summary>

         /// <param name="value">An Enum with Display Attributes</param>

         /// <returns>A string name</returns>

-        public static string GetDisplayValue(T value)

+        public static string GetDisplay(T value)

         {

             FieldInfo fieldInfo = value.GetType().GetField(value.ToString());

             DisplayAttribute[] attributes = (DisplayAttribute[])fieldInfo.GetCustomAttributes(typeof(DisplayAttribute), false);

@@ -59,7 +59,8 @@ namespace HandBrake.ApplicationServices.Functions
             foreach (T val in Enum.GetValues(typeof(T)))

             {

                 string currDescription = GetDescription(val);

-                if (currDescription == description)

+                string currDisplay = GetDisplay(val);

+                if (currDescription == description || currDisplay == description)

                 {

                     return val;

                 }