diff options
| author | Juan Linietsky | 2016-06-18 17:29:41 -0300 |
|---|---|---|
| committer | Rémi Verschelde | 2016-07-09 00:08:33 +0200 |
| commit | 75cc8dc6b411f35f5d7e9ad9636038b1ccddba1c (patch) | |
| tree | 2e0c009edd21055dedf0d3f70270d491f1d40bfd /core | |
| parent | 106199dfa783a56298a932fa13111993bdb73f9e (diff) | |
| download | godot-75cc8dc6b411f35f5d7e9ad9636038b1ccddba1c.tar.gz godot-75cc8dc6b411f35f5d7e9ad9636038b1ccddba1c.tar.zst godot-75cc8dc6b411f35f5d7e9ad9636038b1ccddba1c.zip | |
corrently parse utf8 from zip_io open, closes #1708
this probably failed when exporting or opening android apk files too, should fix that too.
(cherry picked from commit 1c541a2bee5f3ad71509d0d4a08d6db7d97c46da)
Diffstat (limited to 'core')
| -rw-r--r-- | core/io/zip_io.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/io/zip_io.h b/core/io/zip_io.h index 355003d94..0668c47d9 100644 --- a/core/io/zip_io.h +++ b/core/io/zip_io.h @@ -39,11 +39,14 @@ static void* zipio_open(void* data, const char* p_fname, int mode) { FileAccess *&f = *(FileAccess**)data; + String fname; + fname.parse_utf8(p_fname); + if (mode & ZLIB_FILEFUNC_MODE_WRITE) { - f = FileAccess::open(p_fname,FileAccess::WRITE); + f = FileAccess::open(fname,FileAccess::WRITE); } else { - f = FileAccess::open(p_fname,FileAccess::READ); + f = FileAccess::open(fname,FileAccess::READ); } if (!f) |