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

Merge pull request #18520 from paulloz/gdscript-api-string-path

Browse source 
fix API string path
This commit is contained in:
Rémi Verschelde 2018-05-02 10:36:25 +02:00 committed by GitHub
commit f86a67c4d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/io/image_loader.cpp
View file

@ -37,7 +37,7 @@ bool ImageFormatLoader::recognize(const String &p_extension) const {
get_recognized_extensions(&extensions);
for (List<String>::Element *E = extensions.front(); E; E = E->next()) {
if (E->get().nocasecmp_to(p_extension.get_extension()) == 0)
if (E->get().nocasecmp_to(p_extension) == 0)
return true;
}

2
core/io/resource_saver.cpp
View file

@ -56,7 +56,7 @@ Error ResourceSaver::save(const String &p_path, const RES &p_resource, uint32_t
for (List<String>::Element *E = extensions.front(); E; E = E->next()) {
if (E->get().nocasecmp_to(extension.get_extension()) == 0)
if (E->get().nocasecmp_to(extension) == 0)
recognized = true;
}

6
core/ustring.cpp
View file

@ -3755,8 +3755,8 @@ String String::get_file() const {
String String::get_extension() const {
int pos = find_last(".");
if (pos < 0)
return *this;
if (pos < 0 || pos < MAX(find_last("/"), find_last("\\")))
return "";
return substr(pos + 1, length());
}
@ -3834,7 +3834,7 @@ String String::percent_decode() const {
String String::get_basename() const {
int pos = find_last(".");
if (pos < 0)
if (pos < 0 || pos < MAX(find_last("/"), find_last("\\")))
return *this;
return substr(0, pos);