Fix issue with get_current_dir()
returning the wrong path on Android
This commit is contained in:
parent
502a6a7cfa
commit
b5e1096c61
2 changed files with 15 additions and 0 deletions
|
@ -134,6 +134,20 @@ String DirAccessJAndroid::get_drive(int p_drive) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String DirAccessJAndroid::get_current_dir() {
|
||||||
|
String base = _get_root_path();
|
||||||
|
String bd = current_dir;
|
||||||
|
if (base != "") {
|
||||||
|
bd = current_dir.replace_first(base, "");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (bd.begins_with("/")) {
|
||||||
|
return _get_root_string() + bd.substr(1, bd.length());
|
||||||
|
} else {
|
||||||
|
return _get_root_string() + bd;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Error DirAccessJAndroid::change_dir(String p_dir) {
|
Error DirAccessJAndroid::change_dir(String p_dir) {
|
||||||
String new_dir = get_absolute_path(p_dir);
|
String new_dir = get_absolute_path(p_dir);
|
||||||
if (new_dir == current_dir) {
|
if (new_dir == current_dir) {
|
||||||
|
|
|
@ -69,6 +69,7 @@ public:
|
||||||
virtual String get_drive(int p_drive) override;
|
virtual String get_drive(int p_drive) override;
|
||||||
|
|
||||||
virtual Error change_dir(String p_dir) override; ///< can be relative or absolute, return false on success
|
virtual Error change_dir(String p_dir) override; ///< can be relative or absolute, return false on success
|
||||||
|
virtual String get_current_dir() override; ///< return current dir location
|
||||||
|
|
||||||
virtual bool file_exists(String p_file) override;
|
virtual bool file_exists(String p_file) override;
|
||||||
virtual bool dir_exists(String p_dir) override;
|
virtual bool dir_exists(String p_dir) override;
|
||||||
|
|
Loading…
Reference in a new issue