Philip Chimento · @ptomato · Philip Chimento · eee20edf · Georges Basile Stavracas Neto · Philip Chimento
--- a/gi/object.cpp
+++ b/gi/object.cpp
    GJS_DEC_COUNTER(object);
    priv->~ObjectInstance();
    g_slice_free(ObjectInstance, priv);
+
+    /* Remove the ObjectInstace pointer from the JSObject */
+    JS_SetPrivate(obj, nullptr);
+    g_assert(JS_GetPrivate(obj) == nullptr);
--- a/gi/object.cpp
+++ b/gi/object.cpp

    unsigned js_object_finalized : 1;
    unsigned g_object_finalized  : 1;
+
+    /* True if this object has visible JS state, and thus its lifecycle is
+     * managed using toggle references. False if this object just keeps a
+     * hard ref on the underlying GObject, and may be finalized at will. */
+    bool uses_toggle_ref;
--- a/gi/object.cpp
+++ b/gi/object.cpp
        return result.succeed();
    }

+    if (!gjs_get_string_id(context, id, &name)) {
+        /* We need to keep the wrapper alive in order not to loose custom
--- a/gi/object.cpp
+++ b/gi/object.cpp
    GJS_DEC_COUNTER(object);
    priv->~ObjectInstance();
    g_slice_free(ObjectInstance, priv);
+
+    /* Remove the ObjectInstace pointer from the JSObject */
--- a/gi/object.cpp
+++ b/gi/object.cpp

    for (auto iter = wrapped_gobject_list.begin(); iter != wrapped_gobject_list.end(); ) {
        ObjectInstance *priv = *iter;
-        if (priv->keep_alive.rooted() || priv->keep_alive == nullptr ||
+        if (priv->keep_alive == nullptr || priv->keep_alive.rooted() ||