Update ChangeTypeConverter.cs (Windows-XAML#1186)

Checking for IsInstanceOfType instead of object so objects from derived classes don't throw an exception when System.Convert.ChangeType (e.g. when IConvertible is not implemented) is called.
devildog · Aug 23, 2016 · e5f6e5c · e5f6e5c
1 parent 6fbe281
commit e5f6e5c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Template10 (Library)/Converters/ChangeTypeConverter.cs b/Template10 (Library)/Converters/ChangeTypeConverter.cs
@@ -25,8 +25,8 @@ public object Convert(object value, Type targetType, object parameter, string la
             if (value == null && targetType.GetTypeInfo().IsValueType)
                 return Activator.CreateInstance(targetType);
 
-            if (targetType == typeof(object))
-                return (object)value;
+            if (targetType.IsInstanceOfType(value))
+                return value;
 
             return System.Convert.ChangeType(value, targetType);
         }