maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

change invalid characters when get user data dir on Windows & Unix

Browse source 
Can't create user data folder when project name has ``\ / : * ? " < > |`` characters on OS_Windows & OS_Unix.
So, change it to ``-`` to be able to make folder.

fixes #4928 and it's altanative to #4986.

(cherry picked from commit 9073dc9963)
This commit is contained in:
volzhs 2016-06-03 03:39:37 +09:00 committed by Rémi Verschelde
parent ff91f409bf
commit 356c35954a
4 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/os/os.cpp
View file

@ -306,6 +306,15 @@ String OS::get_system_dir(SystemDir p_dir) const {
return ".";
}
String OS::get_safe_application_name() const {
String an = Globals::get_singleton()->get("application/name");
Vector<String> invalid_char = String("\\ / : * ? \" < > |").split(" ");
for (int i=0;i<invalid_char.size();i++) {
an = an.replace(invalid_char[i],"-");
}
return an;
}
String OS::get_data_dir() const {
return ".";

1
core/os/os.h
View file

@ -319,6 +319,7 @@ public:
virtual String get_locale() const;
String get_safe_application_name() const;
virtual String get_data_dir() const;
virtual String get_resource_dir() const;

2
drivers/unix/os_unix.cpp
View file

@ -456,7 +456,7 @@ int OS_Unix::get_processor_count() const {
String OS_Unix::get_data_dir() const {
String an = Globals::get_singleton()->get("application/name");
String an = get_safe_application_name();
if (an!="") {

2
platform/windows/os_windows.cpp
View file

@ -2107,7 +2107,7 @@ String OS_Windows::get_system_dir(SystemDir p_dir) const {
}
String OS_Windows::get_data_dir() const {
String an = Globals::get_singleton()->get("application/name");
String an = get_safe_application_name();
if (an!="") {
if (has_environment("APPDATA")) {