mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-18 20:40:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Data dir returns a symlink in Android 6.0, which confuses DirAccess on android, this should fix it

Browse Source
This commit is contained in:
Juan Linietsky 2016-07-02 11:48:02 -03:00
parent eade613dc7
commit 973a12c5f2
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
platform/android/os_android.cpp
View File

@ -708,8 +708,33 @@ void OS_Android::set_need_reload_hooks(bool p_needs_them) {
String OS_Android::get_data_dir() const {
if (get_data_dir_func)
return get_data_dir_func();
if (data_dir_cache!=String())
return data_dir_cache;
if (get_data_dir_func) {
String data_dir=get_data_dir_func();
//store current dir
char real_current_dir_name[2048];
getcwd(real_current_dir_name,2048);
//go to data dir
chdir(data_dir.utf8().get_data());
//get actual data dir, so we resolve potential symlink (Android 6.0+ seems to use symlink)
char data_current_dir_name[2048];
getcwd(data_current_dir_name,2048);
//cache by parsing utf8
data_dir_cache.parse_utf8(data_current_dir_name);
//restore original dir so we don't mess things up
chdir(real_current_dir_name);
return data_dir_cache
}
return ".";
//return Globals::get_singleton()->get_singleton_object("GodotOS")->call("get_data_dir");
};

2
platform/android/os_android.h
View File

@ -123,6 +123,8 @@ private:
PhysicsServer *physics_server;
Physics2DServer *physics_2d_server;
mutable String data_dir_cache;
#if 0
AudioDriverAndroid audio_driver_android;
#else