|
@@ -547,7 +547,7 @@ import cs.system.Type;
|
|
if (StringTools.startsWith(strParam, "haxe.lang.Null"))
|
|
if (StringTools.startsWith(strParam, "haxe.lang.Null"))
|
|
{
|
|
{
|
|
oargs[i] = mkNullable(oargs[i], param);
|
|
oargs[i] = mkNullable(oargs[i], param);
|
|
- } else if (cast(untyped __typeof__(IConvertible), Type).IsAssignableFrom(param)) {
|
|
|
|
|
|
+ } else if (cast(untyped __typeof__(IConvertible), Type).IsAssignableFrom(param) && !cs.Lib.nativeType(oargs[i]).IsAssignableFrom(param)) {
|
|
if (oargs[i] == null) {
|
|
if (oargs[i] == null) {
|
|
if (param.IsValueType)
|
|
if (param.IsValueType)
|
|
oargs[i] = Activator.CreateInstance(param);
|
|
oargs[i] = Activator.CreateInstance(param);
|