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

Fix Directory.dir_exist/get_current_dir for 'res://' on Android

Browse source 
Fix #7014

(cherry picked from commit 8d454ed9a7)
This commit is contained in:
volzhs 2016-11-04 00:41:16 +09:00 committed by Rémi Verschelde
parent 0413d85add
commit 3e127ce3fd
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
platform/android/dir_access_jandroid.cpp
View file

@ -154,7 +154,7 @@ Error DirAccessJAndroid::change_dir(String p_dir){
String DirAccessJAndroid::get_current_dir(){ String DirAccessJAndroid::get_current_dir(){
return "/"+current_dir; return "res://"+current_dir;
} }
bool DirAccessJAndroid::file_exists(String p_file){ bool DirAccessJAndroid::file_exists(String p_file){
@ -268,6 +268,6 @@ DirAccessJAndroid::DirAccessJAndroid() {
DirAccessJAndroid::~DirAccessJAndroid() { DirAccessJAndroid::~DirAccessJAndroid() {
list_dir_end();; list_dir_end();
} }
#endif #endif

5
platform/android/java/src/org/godotengine/godot/GodotIO.java
View file

@ -288,6 +288,11 @@ public class GodotIO {
try { try {
ad.files = am.list(path); ad.files = am.list(path);
// no way to find path is directory or file exactly.
// but if ad.files.length==0, then it's an empty directory or file.
if (ad.files.length==0) {
return -1;
}
} catch (IOException e) { } catch (IOException e) {
System.out.printf("Exception on dir_open: %s\n",e); System.out.printf("Exception on dir_open: %s\n",e);