浏览代码

Merge pull request #15684 from karroffel/nativescript-windows-editor-crash

[GDNative] fix editor crash with NativeScript
Thomas Herzog 7 年之前
父节点
当前提交
859ac6233d
共有 1 个文件被更改,包括 6 次插入4 次删除
  1. 6 4
      modules/gdnative/nativescript/nativescript.cpp

+ 6 - 4
modules/gdnative/nativescript/nativescript.cpp

@@ -835,12 +835,14 @@ NativeScriptLanguage::~NativeScriptLanguage() {
 
 	for (Map<String, Ref<GDNative> >::Element *L = NSL->library_gdnatives.front(); L; L = L->next()) {
 
-		L->get()->terminate();
-		NSL->library_classes.clear();
-		NSL->library_gdnatives.clear();
-		NSL->library_script_users.clear();
+		if (L->get().is_valid())
+			L->get()->terminate();
 	}
 
+	NSL->library_classes.clear();
+	NSL->library_gdnatives.clear();
+	NSL->library_script_users.clear();
+
 #ifndef NO_THREADS
 	memdelete(mutex);
 #endif