diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-09-25 11:51:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-25 11:51:54 +0200 |
| commit | dec10dd776fca2994277faa3a97b13e70317f784 (patch) | |
| tree | cea7622b2e2bb0d2cede33274807cb98b4fef856 /core/io/file_access_zip.cpp | |
| parent | de03ee94cc4df1a451c6f64e984b1da307d0f4b4 (diff) | |
| parent | 17732fe698b835c29f77c84f329b2ed6cab215ce (diff) | |
| download | redot-engine-dec10dd776fca2994277faa3a97b13e70317f784.tar.gz | |
Merge pull request #32051 from qarmin/some_error_explanation
Added some obvious errors explanations
Diffstat (limited to 'core/io/file_access_zip.cpp')
| -rw-r--r-- | core/io/file_access_zip.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/io/file_access_zip.cpp b/core/io/file_access_zip.cpp index abc0bd064d..81568b2aae 100644 --- a/core/io/file_access_zip.cpp +++ b/core/io/file_access_zip.cpp @@ -117,7 +117,7 @@ static void godot_free(voidpf opaque, voidpf address) { void ZipArchive::close_handle(unzFile p_file) const { - ERR_FAIL_COND(!p_file); + ERR_FAIL_COND_MSG(!p_file, "Cannot close a file if none is open."); FileAccess *f = (FileAccess *)unzGetOpaque(p_file); unzCloseCurrentFile(p_file); unzClose(p_file); @@ -126,11 +126,11 @@ void ZipArchive::close_handle(unzFile p_file) const { unzFile ZipArchive::get_file_handle(String p_file) const { - ERR_FAIL_COND_V(!file_exists(p_file), NULL); + ERR_FAIL_COND_V_MSG(!file_exists(p_file), NULL, "File '" + p_file + " doesn't exist."); File file = files[p_file]; FileAccess *f = FileAccess::open(packages[file.package].filename, FileAccess::READ); - ERR_FAIL_COND_V(!f, NULL); + ERR_FAIL_COND_V_MSG(!f, NULL, "Cannot open file '" + packages[file.package].filename + "'."); zlib_filefunc_def io; zeromem(&io, sizeof(io)); |