Merge pull request #94373 from maiself/fix-library-path-as-abs

akien-mga · akien-mga · commit 31f696cf037e · 2024-07-17T12:24:07.000+02:00
Fix to restore `library_path` as absolute path
diff --git a/core/extension/gdextension.cpp b/core/extension/gdextension.cpp
@@ -795,7 +795,7 @@ Error GDExtension::open_library(const String &p_path, const String &p_entry_symb
 		// because that's what we want to check to see if it's changed.
 		library_path = actual_lib_path.get_base_dir().path_join(p_path.get_file());
 	} else {
-		library_path = p_path;
+		library_path = actual_lib_path;
 	}
 
 	ERR_FAIL_COND_V_MSG(err == ERR_FILE_NOT_FOUND, err, "GDExtension dynamic library not found: " + abs_path);

Original file line number	Diff line number	Diff line change
`@@ -795,7 +795,7 @@ Error GDExtension::open_library(const String &p_path, const String &p_entry_symb`
`795`	`795`	`// because that's what we want to check to see if it's changed.`
`796`	`796`	`library_path = actual_lib_path.get_base_dir().path_join(p_path.get_file());`
`797`	`797`	`} else {`
`798`		`- library_path = p_path;`
	`798`	`+ library_path = actual_lib_path;`
`799`	`799`	`}`
`800`	`800`
`801`	`801`	`ERR_FAIL_COND_V_MSG(err == ERR_FILE_NOT_FOUND, err, "GDExtension dynamic library not found: " + abs_path);`