summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorCatchawink <threeeasywords@gmail.com>2019-12-14 05:06:29 -0500
committerCatchawink <threeeasywords@email.com>2019-12-16 09:50:42 -0500
commitb2a14042d52b45ae0554f4146c700b18f50ee92f (patch)
tree478a485bf731a9cb5032d1ecd4afea00a006796c /core
parent3a9284b562d6dcfc339322999767168e12220895 (diff)
Fixed issues with using a relative path in the export window.
Before this fix, opening relative export paths inside of an EditorFileDialog was not possible. This was fixed by modifying String::path_to_file() to save relative paths in EditorExportPreset::set_export_path() more appropriately and changing EditorFileDialog::set_current_dir() to open relative paths.
Diffstat (limited to 'core')
-rw-r--r--core/ustring.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/ustring.cpp b/core/ustring.cpp
index 6a1dc2295f..345db0eb13 100644
--- a/core/ustring.cpp
+++ b/core/ustring.cpp
@@ -3792,7 +3792,8 @@ bool String::is_valid_float() const {
String String::path_to_file(const String &p_path) const {
- String src = this->replace("\\", "/").get_base_dir();
+ // Don't get base dir for src, this is expected to be a dir already.
+ String src = this->replace("\\", "/");
String dst = p_path.replace("\\", "/").get_base_dir();
String rel = src.path_to(dst);
if (rel == dst) // failed