gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-05 08:08:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #80720 from dsnopek/gdextension-dll-copy-error

Browse source 
GDExtension: Remove DLL copy if it fails to load
This commit is contained in:
Rémi Verschelde 2023-08-18 00:41:11 +02:00
parent 0511f9d9a7 908b8c0507
commit 5dc7e23198
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/extension/gdextension.cpp
View file

@ -689,6 +689,12 @@ Ref<Resource> GDExtensionResourceLoader::load(const String &p_path, const String
}
if (err != OK) {
#if defined(WINDOWS_ENABLED) && defined(TOOLS_ENABLED)
// If the DLL fails to load, make sure that temporary DLL copies are cleaned up.
if (Engine::get_singleton()->is_editor_hint()) {
DirAccess::remove_absolute(lib->get_temp_library_path());
}
#endif
// Errors already logged in open_library()
return Ref<Resource>();
}

1
core/extension/gdextension.h
View file

@ -81,6 +81,7 @@ public:
#if defined(WINDOWS_ENABLED) && defined(TOOLS_ENABLED)
void set_temp_library_path(const String &p_path) { temp_lib_path = p_path; }
String get_temp_library_path() const { return temp_lib_path; }
#endif
enum InitializationLevel {