From fc838213165a1175411fe8b4c3ce1e9a99decb2e Mon Sep 17 00:00:00 2001 From: bncastle Date: Sun, 10 Sep 2017 17:39:42 -0400 Subject: Fixed attempt to delete NULL pointer error Fixed: Error cause by attemptng to delete a NULL pointer. unregister_gdnative_types() now checks discoverer to see if it is NULL before deleting. After selecting a godot project to edit (in Win10), the discoverer_callback() wasn't called thus discoverer was NULL. --- modules/gdnative/register_types.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gdnative/register_types.cpp b/modules/gdnative/register_types.cpp index d809109987..559e9fa455 100644 --- a/modules/gdnative/register_types.cpp +++ b/modules/gdnative/register_types.cpp @@ -248,7 +248,7 @@ void unregister_gdnative_types() { memdelete(GDNativeCallRegistry::singleton); #ifdef TOOLS_ENABLED - if (Engine::get_singleton()->is_editor_hint()) { + if (Engine::get_singleton()->is_editor_hint() && discoverer != NULL) { memdelete(discoverer); } #endif -- cgit v1.2.3