godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

Perform a cleaner exit for resource preview, fixes #24206

Browse Source
This commit is contained in:
Juan Linietsky
2019-01-17 09:09:01 -03:00
parent 3b46e99a39
commit e8d31cc765
4 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
editor/editor_node.cpp
View File

@@ -494,7 +494,7 @@ void EditorNode::_fs_changed() {
}
}
get_tree()->quit();
_exit_editor();
}
}
@@ -1120,7 +1120,7 @@ void EditorNode::save_all_scenes_and_restart() {
to_reopen = get_tree()->get_edited_scene_root()->get_filename();
}
get_tree()->quit();
_exit_editor();
String exec = OS::get_singleton()->get_executable_path();
List<String> args;
@@ -2356,6 +2356,12 @@ int EditorNode::_next_unsaved_scene(bool p_valid_filename, int p_start) {
return -1;
}
void EditorNode::_exit_editor() {
exiting = true;
resource_preview->stop(); //stop early to avoid crashes
get_tree()->quit();
}
void EditorNode::_discard_changes(const String &p_str) {
switch (current_option) {
@@ -2383,14 +2389,13 @@ void EditorNode::_discard_changes(const String &p_str) {
case FILE_QUIT: {
_menu_option_confirm(RUN_STOP, true);
exiting = true;
get_tree()->quit();
_exit_editor();
} break;
case RUN_PROJECT_MANAGER: {
_menu_option_confirm(RUN_STOP, true);
exiting = true;
get_tree()->quit();
_exit_editor();
String exec = OS::get_singleton()->get_executable_path();
List<String> args;