Changes necessary for hot reload to work

2 files changed, 22 insertions, 0 deletions

diff --git a/src/classes/wrapped.cpp b/src/classes/wrapped.cpp
index 1e9239c..5b425c7 100644
--- a/src/classes/wrapped.cpp
+++ b/src/classes/wrapped.cpp
@@ -49,6 +49,25 @@ void Wrapped::_postinitialize() {
 }
 
 Wrapped::Wrapped(const StringName p_godot_class) {
+#ifdef HOT_RELOAD_ENABLED
+	if (unlikely(Wrapped::recreate_instance)) {
+		RecreateInstance *recreate_data = Wrapped::recreate_instance;
+		RecreateInstance *previous = nullptr;
+		while (recreate_data) {
+			if (recreate_data->wrapper == this) {
+				_owner = recreate_data->owner;
+				if (previous) {
+					previous->next = recreate_data->next;
+				} else {
+					Wrapped::recreate_instance = recreate_data->next;
+				}
+				return;
+			}
+			previous = recreate_data;
+			recreate_data = recreate_data->next;
+		}
+	}
+#endif
 	_owner = godot::internal::gdextension_interface_classdb_construct_object(reinterpret_cast<GDExtensionConstStringNamePtr>(p_godot_class._native_ptr()));
 }
 
diff --git a/src/core/class_db.cpp b/src/core/class_db.cpp
index 9aaacef..7219a79 100644
--- a/src/core/class_db.cpp
+++ b/src/core/class_db.cpp
@@ -365,6 +365,9 @@ void ClassDB::deinitialize(GDExtensionInitializationLevel p_level) {
 		for (auto method : cl.method_map) {
 			memdelete(method.second);
 		}
+
+		classes.erase(*i);
+		class_register_order.erase((i + 1).base());
 	}
 }