From 0639946c72ba6632bc3b0953d64f644af328e5e6 Mon Sep 17 00:00:00 2001 From: Ignacio Etcheverry Date: Wed, 3 Jul 2019 09:53:52 +0200 Subject: [PATCH] Fix localize_path not always working We make sure the resource dir path ends with a trailing '/' for safety reasons, so we must make sure the path we compare it to does so as well. --- core/project_settings.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/project_settings.cpp b/core/project_settings.cpp index fc1a74801d8..a9cc529cdc8 100644 --- a/core/project_settings.cpp +++ b/core/project_settings.cpp @@ -83,6 +83,10 @@ String ProjectSettings::localize_path(const String &p_path) const { // `plus_file("")` is an easy way to ensure we have a trailing '/'. const String res_path = resource_path.plus_file(""); + // DirAccess::get_current_dir() is not guaranteed to return a path that with a trailing '/', + // so we must make sure we have it as well in order to compare with 'res_path'. + cwd = cwd.plus_file(""); + if (!cwd.begins_with(res_path)) { return p_path; };