fix extra ctor call for module/chugin import

ccrma · Dec 1, 2023 · 8d7b638 · 8d7b638
1 parent eb0cefb
commit 8d7b638
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/core/chuck_scan.cpp b/src/core/chuck_scan.cpp
@@ -2904,6 +2904,8 @@ t_CKBOOL type_engine_scan2_func_def( Chuck_Env * env, a_Func_Def f )
     func->code = new Chuck_VM_Code;
     // add reference
     CK_SAFE_ADD_REF( func->code );
+    // add name | 1.5.2.0
+    func->code->name = S_name(f->name);
     // copy the native code, for imported functions
     if( f->s_type == ae_func_builtin )
     {

diff --git a/src/core/chuck_type.cpp b/src/core/chuck_type.cpp
@@ -8612,7 +8612,7 @@ t_CKBOOL type_engine_add_class_from_dl( Chuck_Env * env, Chuck_DL_Class * c )
         // begin import as ugen
         if( !type_engine_import_ugen_begin( env, c->name.c_str(),
                                             c->parent.c_str(), env->global(),
-                                            ctor ? ctor->ctor : NULL,
+                                            NULL, // ctor ? ctor->ctor : NULL, // ctors from DL added as type_engine_import_ctor()
                                             dtor ? dtor->dtor : NULL,
                                             c->ugen_tick, c->ugen_tickf, c->ugen_pmsg,
                                             c->ugen_num_in, c->ugen_num_out,
@@ -8624,7 +8624,7 @@ t_CKBOOL type_engine_add_class_from_dl( Chuck_Env * env, Chuck_DL_Class * c )
         // begin import as normal class (non-ugen)
         if( !type_engine_import_class_begin( env, c->name.c_str(),
                                              c->parent.c_str(), env->global(),
-                                             ctor ? ctor->ctor : NULL,
+                                             NULL, // ctor ? ctor->ctor : NULL, // ctors from DL added as type_engine_import_ctor()
                                              dtor ? dtor->dtor : NULL,
                                              c->doc.length() > 0 ? c->doc.c_str() : NULL ) )
             goto error;