diff options
| author | Braden Bodily <thebodily@gmail.com> | 2019-08-14 20:57:49 -0600 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2019-08-17 12:33:15 +0200 |
| commit | 71d71d55b5c0d6da4d1555823ac432bf0b33389a (patch) | |
| tree | 20b2e819d599d6d1bd459bb51880c31e97cfe825 /editor/export_template_manager.cpp | |
| parent | 40640a01dc90be00e55e4eef3c7800401ef63b18 (diff) | |
Replace 'ERR_EXPLAIN' with 'ERR_FAIL_*_MSG' in 'core/' and 'editor/'
Condensed some if and ERR statements. Added dots to end of error messages
Couldn't figure out EXPLAINC. These files gave me trouble: core/error_macros.h, core/io/file_access_buffered_fa.h (where is it?),
core/os/memory.cpp,
drivers/png/png_driver_common.cpp,
drivers/xaudio2/audio_driver_xaudio2.cpp (where is it?)
Diffstat (limited to 'editor/export_template_manager.cpp')
| -rw-r--r-- | editor/export_template_manager.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/editor/export_template_manager.cpp b/editor/export_template_manager.cpp index 72a4b43737..68e859966c 100644 --- a/editor/export_template_manager.cpp +++ b/editor/export_template_manager.cpp @@ -321,8 +321,7 @@ bool ExportTemplateManager::_install_from_file(const String &p_file, bool p_use_ if (!f) { ret = unzGoToNextFile(pkg); fc++; - ERR_EXPLAIN("Can't open file from path: " + String(to_write)); - ERR_CONTINUE(true); + ERR_CONTINUE_MSG(true, "Can't open file from path: " + String(to_write) + "."); } f->store_buffer(data.ptr(), data.size()); @@ -591,8 +590,7 @@ Error ExportTemplateManager::install_android_template() { zlib_filefunc_def io = zipio_create_io_from_file(&src_f); unzFile pkg = unzOpen2(source_zip.utf8().get_data(), &io); - ERR_EXPLAIN("Android sources not in zip format"); - ERR_FAIL_COND_V(!pkg, ERR_CANT_OPEN); + ERR_FAIL_COND_V_MSG(!pkg, ERR_CANT_OPEN, "Android sources not in zip format."); int ret = unzGoToFirstFile(pkg); |