Fixed a crash when creating an object while handling a Qt meta-call.

Signed-off-by: Dimitar Dobrev <[email protected]>
ddobrev · Sep 19, 2017 · e231735 · e231735
1 parent d509ac6
commit e231735
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+0.7.3 - 19.9.2017
+Fixed:
+- Crash when creating an object while handling a Qt meta-call.
+
 0.7.2 - 18.9.2017
 Added:
 - Bindings for the constructors of QImage and QPixmap taking arrays;

diff --git a/QtSharp/QObject.cs b/QtSharp/QObject.cs
@@ -72,7 +72,12 @@ private object GetParameterValue(Handler handler, int i, System.Reflection.Param
                 case TypeCode.Empty:
                     return null;
                 case TypeCode.Object:
-                    return Activator.CreateInstance(type, arg);
+                    var constructor = type.GetMethod("__CreateInstance",
+                                                     global::System.Reflection.BindingFlags.NonPublic |
+                                                     global::System.Reflection.BindingFlags.Static |
+                                                     global::System.Reflection.BindingFlags.FlattenHierarchy,
+                                                     null, new[] { typeof(IntPtr), typeof(bool) }, null);
+                    return constructor.Invoke(null, new object[] { arg, false });
                 case TypeCode.DBNull:
                     return DBNull.Value;
                 case TypeCode.Boolean: