From d71171026f321b635b93e1c4e026f791ff51d324 Mon Sep 17 00:00:00 2001
From: Ruslan Mustakov
Date: Fri, 4 Aug 2017 21:17:33 +0700
Subject: Dont call nativescript callbacks if lib is not initialized

---
 modules/gdnative/gdnative.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'modules/gdnative/gdnative.cpp')

diff --git a/modules/gdnative/gdnative.cpp b/modules/gdnative/gdnative.cpp
index 158f7fd94..07dba921b 100644
--- a/modules/gdnative/gdnative.cpp
+++ b/modules/gdnative/gdnative.cpp
@@ -155,7 +155,6 @@ String GDNativeLibrary::get_active_library_path() const {
 }
 
 GDNative::GDNative() {
-	initialized = false;
 	native_handle = NULL;
 }
 
@@ -219,6 +218,9 @@ bool GDNative::initialize() {
 			library_init);
 
 	if (err || !library_init) {
+		OS::get_singleton()->close_dynamic_library(native_handle);
+		native_handle = NULL;
+		ERR_PRINT("Failed to obtain godot_gdnative_init symbol");
 		return false;
 	}
 
@@ -272,7 +274,11 @@ bool GDNative::terminate() {
 	OS::get_singleton()->close_dynamic_library(native_handle);
 	native_handle = NULL;
 
-	return false;
+	return true;
+}
+
+bool GDNative::is_initialized() {
+	return (native_handle != NULL);
 }
 
 void GDNativeCallRegistry::register_native_call_type(StringName p_call_type, native_call_cb p_callback) {
-- 
cgit v1.2.3-70-g09d2