seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GDExtension: Remove DLL copy if it fails to load

Browse Source
This commit is contained in:
David Snopek
2023-08-16 17:49:59 -05:00
parent a278c1b98a
commit 908b8c0507
2 changed files with 7 additions and 0 deletions
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 (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() // Errors already logged in open_library()
return Ref<Resource>(); return Ref<Resource>();
} }

1
core/extension/gdextension.h
View File

@ -81,6 +81,7 @@ public:
#if defined(WINDOWS_ENABLED) && defined(TOOLS_ENABLED) #if defined(WINDOWS_ENABLED) && defined(TOOLS_ENABLED)
void set_temp_library_path(const String &p_path) { temp_lib_path = p_path; } 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 #endif
enum InitializationLevel { enum InitializationLevel {