Skip to content

Commit

Permalink
Merge pull request #44610 from m4gr3d/fix_top_level_android_export_3_2
Browse files Browse the repository at this point in the history
[3.2] Fix the `String::get_base_dir()` logic to properly check for top level directories on Windows
  • Loading branch information
akien-mga authored Dec 23, 2020
2 parents 7ef143f + 94aa09a commit cddff04
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion core/ustring.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3970,7 +3970,10 @@ bool String::is_rel_path() const {

String String::get_base_dir() const {

int basepos = find("://");
int basepos = find(":/");
if (basepos == -1) {
basepos = find(":\\");
}
String rs;
String base;
if (basepos != -1) {
Expand Down

0 comments on commit cddff04

Please sign in to comment.