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

GDExtension: Remove DLL copy if it fails to load
godotengine · Aug 17, 2023 · 5dc7e23 · 5dc7e23
2 parents 0511f9d + 908b8c0
commit 5dc7e23
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/core/extension/gdextension.cpp b/core/extension/gdextension.cpp
@@ -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>();
 	}

diff --git a/core/extension/gdextension.h b/core/extension/gdextension.h
@@ -81,6 +81,7 @@ class GDExtension : public Resource {
 
 #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 {