Merge branch 'GoaLitiuM-managed_handle_fix' into 1.6

2023-05-05 11:40:43 +02:00
parent 634053432e b1988776ab
commit 238526bdc4
1 changed files with 3 additions and 3 deletions
@@ -634,15 +634,15 @@ DEFINE_INTERNAL_CALL(void) ObjectInternal_ManagedInstanceCreated(MObject* manage
        return;
    }

+    // Link created managed instance to the unmanaged object
+    obj->SetManagedInstance(managedInstance);
+
    // Set default name for actors
    if (auto* actor = dynamic_cast<Actor*>(obj))
    {
        actor->SetName(String(typeClass->GetName()));
    }

-    // Link created managed instance to the unmanaged object
-    obj->SetManagedInstance(managedInstance);
-
    MClass* monoClass = obj->GetClass();

    // Set handle to unmanaged object