Browse Source

Merge pull request #11158 from bncastle/master

unregister_gdnative_types() now checks if discoverer pointer is NULL before deleting
Thomas Herzog 8 years ago
parent
commit
5f39f3a2df
1 changed files with 1 additions and 1 deletions
  1. 1 1
      modules/gdnative/register_types.cpp

+ 1 - 1
modules/gdnative/register_types.cpp

@@ -248,7 +248,7 @@ void unregister_gdnative_types() {
 	memdelete(GDNativeCallRegistry::singleton);
 	memdelete(GDNativeCallRegistry::singleton);
 
 
 #ifdef TOOLS_ENABLED
 #ifdef TOOLS_ENABLED
-	if (Engine::get_singleton()->is_editor_hint()) {
+	if (Engine::get_singleton()->is_editor_hint() && discoverer != NULL) {
 		memdelete(discoverer);
 		memdelete(discoverer);
 	}
 	}
 #endif
 #endif