Merge pull request #11158 from bncastle/master

unregister_gdnative_types() now checks if discoverer pointer is NULL before deleting
2017-09-10 23:44:38 +02:00
parent d1cb73b47a fc83821316
commit 5f39f3a2df
1 changed files with 1 additions and 1 deletions
--- 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