Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-24 19:01:22 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix Windows-to-Linux export error

Browse Source 
Now chmod() returns ERR_UNAVAILABLE by default, to signal the caller the problem is lack of support instead of a failed operation.
This commit is contained in:
Pedro J. Estébanez 2017-12-06 20:25:41 +01:00
parent 7459ade298
commit 7fb9508cfa
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/os/dir_access.cpp
View File

@ -333,6 +333,9 @@ Error DirAccess::copy(String p_from, String p_to, int chmod_flags) {
if (err == OK && chmod_flags != -1) { if (err == OK && chmod_flags != -1) {
fdst->close(); fdst->close();
err = fdst->_chmod(p_to, chmod_flags); err = fdst->_chmod(p_to, chmod_flags);
// If running on a platform with no chmod support (i.e., Windows), don't fail
if (err == ERR_UNAVAILABLE)
err = OK;
} }
memdelete(fsrc); memdelete(fsrc);

2
core/os/file_access.h
View File

@ -141,7 +141,7 @@ public:
virtual Error reopen(const String &p_path, int p_mode_flags); ///< does not change the AccessType virtual Error reopen(const String &p_path, int p_mode_flags); ///< does not change the AccessType
virtual Error _chmod(const String &p_path, int p_mod) { return FAILED; } virtual Error _chmod(const String &p_path, int p_mod) { return ERR_UNAVAILABLE; }
static FileAccess *create(AccessType p_access); /// Create a file access (for the current platform) this is the only portable way of accessing files. static FileAccess *create(AccessType p_access); /// Create a file access (for the current platform) this is the only portable way of accessing files.
static FileAccess *create_for_path(const String &p_path); static FileAccess *create_for_path(const String &p_path);