diff options
| -rw-r--r-- | core/os/file_access.cpp | 3 | ||||
| -rw-r--r-- | editor/editor_node.cpp | 6 | ||||
| -rw-r--r-- | editor/editor_spin_slider.cpp | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/core/os/file_access.cpp b/core/os/file_access.cpp index 679b1c9054..e7ad544a93 100644 --- a/core/os/file_access.cpp +++ b/core/os/file_access.cpp @@ -353,7 +353,8 @@ Vector<String> FileAccess::get_csv_line(const String &p_delim) const { String l; int qc = 0; do { - ERR_FAIL_COND_V(eof_reached(), Vector<String>()); + if (eof_reached()) + break; l += get_line() + "\n"; qc = 0; diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 1063447376..3bd7678746 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -3135,6 +3135,9 @@ bool EditorNode::is_scene_in_use(const String &p_path) { void EditorNode::register_editor_types() { + ResourceLoader::set_timestamp_on_load(true); + ResourceSaver::set_timestamp_on_save(true); + ClassDB::register_class<EditorPlugin>(); ClassDB::register_class<EditorImportPlugin>(); ClassDB::register_class<EditorScript>(); @@ -4826,9 +4829,6 @@ EditorNode::EditorNode() { ResourceLoader::set_error_notify_func(this, _load_error_notify); ResourceLoader::set_dependency_error_notify_func(this, _dependency_error_report); - ResourceLoader::set_timestamp_on_load(true); - ResourceSaver::set_timestamp_on_save(true); - { //register importers at the beginning, so dialogs are created with the right extensions Ref<ResourceImporterTexture> import_texture; import_texture.instance(); diff --git a/editor/editor_spin_slider.cpp b/editor/editor_spin_slider.cpp index 1b7322fd13..3d4cf41b80 100644 --- a/editor/editor_spin_slider.cpp +++ b/editor/editor_spin_slider.cpp @@ -155,7 +155,9 @@ void EditorSpinSlider::_grabber_gui_input(const Ref<InputEvent> &p_event) { void EditorSpinSlider::_notification(int p_what) { - if (p_what == MainLoop::NOTIFICATION_WM_FOCUS_OUT || p_what == MainLoop::NOTIFICATION_WM_FOCUS_IN) { + if (p_what == MainLoop::NOTIFICATION_WM_FOCUS_OUT || + p_what == MainLoop::NOTIFICATION_WM_FOCUS_IN || + p_what == NOTIFICATION_EXIT_TREE) { if (grabbing_spinner) { Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE); grabbing_spinner = false; |