diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2022-04-11 14:12:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-11 14:12:18 +0200 |
commit | 5613ac37d658820fd0e4c3162f24a3b68414d3f9 (patch) | |
tree | 533d5ed29331e94be8f6978fd98137844376d55b /platform/android/dir_access_jandroid.cpp | |
parent | 2ec68599a45231767bb970e7bf06a3bf7ed5fc91 (diff) | |
parent | 9381acb6a42da653cb6dfd9e610dfccead11aa98 (diff) |
Merge pull request #59440 from bruvzg/fd_ref_counted
Diffstat (limited to 'platform/android/dir_access_jandroid.cpp')
-rw-r--r-- | platform/android/dir_access_jandroid.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/android/dir_access_jandroid.cpp b/platform/android/dir_access_jandroid.cpp index 7fb4f54fca..e2b1c757d6 100644 --- a/platform/android/dir_access_jandroid.cpp +++ b/platform/android/dir_access_jandroid.cpp @@ -42,7 +42,7 @@ jmethodID DirAccessJAndroid::_dir_next = nullptr; jmethodID DirAccessJAndroid::_dir_close = nullptr; jmethodID DirAccessJAndroid::_dir_is_dir = nullptr; -DirAccess *DirAccessJAndroid::create_fs() { +Ref<DirAccess> DirAccessJAndroid::create_fs() { return memnew(DirAccessJAndroid); } @@ -143,7 +143,7 @@ Error DirAccessJAndroid::change_dir(String p_dir) { return OK; } -String DirAccessJAndroid::get_current_dir(bool p_include_drive) { +String DirAccessJAndroid::get_current_dir(bool p_include_drive) const { return "res://" + current_dir; } @@ -155,9 +155,9 @@ bool DirAccessJAndroid::file_exists(String p_file) { sd = current_dir.plus_file(p_file); } - FileAccessAndroid *f = memnew(FileAccessAndroid); + Ref<FileAccessAndroid> f; + f.instantiate(); bool exists = f->file_exists(sd); - memdelete(f); return exists; } |