Fixed a bug related to converting to non-IConvertible types.

Author: timothylcooke

MathConverter/MathConverter.cs

@@ -218,7 +218,19 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
                                 return System.Convert.ChangeType(evaluatedValue, targetType.GetGenericArguments()[0]);
                         }
 
-                        return System.Convert.ChangeType(evaluatedValue, targetType);
+                        if ((targetType.IsClass && ReferenceEquals(evaluatedValue, null)) || (!ReferenceEquals(evaluatedValue, null) && targetType.IsAssignableFrom(evaluatedValue.GetType())))
+                        {
+                            return evaluatedValue;
+                        }
+                        else if (targetType is IConvertible)
+                        {
+                            return System.Convert.ChangeType(evaluatedValue, targetType);
+                        }
+                        else
+                        {
+                            // Welp, we can't convert this value... O well.
+                            return evaluatedValue;
+                        }
                 }
                 var value = x[0].Evaluate(values);
                 if (value == null)

MathConverter/Properties/AssemblyInfo.cs

@@ -51,8 +51,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.1.1")]
-[assembly: AssemblyFileVersion("1.2.1.1")]
+[assembly: AssemblyVersion("1.2.1.2")]
+[assembly: AssemblyFileVersion("1.2.1.2")]
 
 [assembly: XmlnsPrefix("http://hexinnovation.com/math", "math")]
 [assembly: XmlnsDefinition("http://hexinnovation.com/math", "HexInnovation")]