asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #34348 from Catchawink/master

Browse source 
Fixed issues with using a relative path in the export window.
This commit is contained in:
Rémi Verschelde 2019-12-17 22:24:34 +01:00 committed by GitHub
commit 7d34d1a85f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/ustring.cpp
View file

@ -3792,7 +3792,8 @@ bool String::is_valid_float() const {
String String::path_to_file(const String &p_path) 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 dst = p_path.replace("\\", "/").get_base_dir();
String rel = src.path_to(dst); String rel = src.path_to(dst);
if (rel == dst) // failed if (rel == dst) // failed

2
editor/editor_file_dialog.cpp
View file

@ -958,6 +958,8 @@ String EditorFileDialog::get_current_path() const {
} }
void EditorFileDialog::set_current_dir(const String &p_dir) { void EditorFileDialog::set_current_dir(const String &p_dir) {
if (p_dir.is_rel_path())
dir_access->change_dir(OS::get_singleton()->get_resource_dir());
dir_access->change_dir(p_dir); dir_access->change_dir(p_dir);
update_dir(); update_dir();
invalidate(); invalidate();