From 06e537fec5a4c4ed16a2f3b616c59d19be573c60 Mon Sep 17 00:00:00 2001 From: Marcelo Fernandez Date: Sat, 10 Mar 2018 16:47:10 -0300 Subject: [PATCH] Added error checks for fscache saving --- editor/editor_file_system.cpp | 20 ++++++++++++++------ editor/editor_settings.cpp | 7 ++----- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp index a6fc8dcddf7..115d09f00fb 100644 --- a/editor/editor_file_system.cpp +++ b/editor/editor_file_system.cpp @@ -274,9 +274,13 @@ void EditorFileSystem::_scan_filesystem() { memdelete(d); f = FileAccess::open(fscache, FileAccess::WRITE); - _save_filesystem_cache(new_filesystem, f); - f->close(); - memdelete(f); + if (f == NULL) { + ERR_PRINTS("Error writing fscache: " + fscache); + } else { + _save_filesystem_cache(new_filesystem, f); + f->close(); + memdelete(f); + } scanning = false; } @@ -285,9 +289,13 @@ void EditorFileSystem::_save_filesystem_cache() { String fscache = EditorSettings::get_singleton()->get_project_settings_path().plus_file("filesystem_cache3"); FileAccess *f = FileAccess::open(fscache, FileAccess::WRITE); - _save_filesystem_cache(filesystem, f); - f->close(); - memdelete(f); + if (f == NULL) { + ERR_PRINTS("Error writing fscache: " + fscache); + } else { + _save_filesystem_cache(filesystem, f); + f->close(); + memdelete(f); + } } void EditorFileSystem::_thread_func(void *_userdata) { diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index bc91fcdf04e..7c3df5c78ba 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -856,11 +856,8 @@ void EditorSettings::save() { Error err = ResourceSaver::save(singleton->config_file_path, singleton); if (err != OK) { - ERR_PRINT("Can't Save!"); - return; - } - - if (OS::get_singleton()->is_stdout_verbose()) { + ERR_PRINTS("Error saving editor settings to " + singleton->config_file_path); + } else if (OS::get_singleton()->is_stdout_verbose()) { print_line("EditorSettings Save OK!"); } }