godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #44609 from m4gr3d/fix_top_level_android_export 

Fix the `String::get_base_dir()` logic to properly check for top level directories on Windows
This commit is contained in:
Rémi Verschelde 2020-12-23 23:56:45 +01:00 committed by GitHub
parent c4c211c3b7 8edacea04a
commit 210ebb04d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/string/ustring.cpp
View File

@ -4285,7 +4285,10 @@ bool String::is_rel_path() const {
} }
String String::get_base_dir() const { String String::get_base_dir() const {
int basepos = find("://"); int basepos = find(":/");
if (basepos == -1) {
basepos = find(":\\");
}
String rs; String rs;
String base; String base;
if (basepos != -1) { if (basepos != -1) {