summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Herzog <thomas.herzog@mail.com>2017-09-10 23:44:38 +0200
committerGitHub <noreply@github.com>2017-09-10 23:44:38 +0200
commit5f39f3a2dfba500b6c9cd8f87b0dd35949043822 (patch)
tree9e6a0f72eba1840fda4a328c0bb89e2280be6906
parentd1cb73b47a17de830d9474026ffa7b3587cfbc68 (diff)
parentfc838213165a1175411fe8b4c3ce1e9a99decb2e (diff)
Merge pull request #11158 from bncastle/master
unregister_gdnative_types() now checks if discoverer pointer is NULL before deleting
-rw-r--r--modules/gdnative/register_types.cpp2
1 files changed, 1 insertions, 1 deletions
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