asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix crash on closing [empty](*) scene tab

Browse source
This commit is contained in:
Poommetee Ketson 2017-07-10 01:48:39 +07:00
parent 0bf88e4b38
commit 7c5a19dcd6
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
editor/editor_node.cpp
View file

@ -2753,6 +2753,8 @@ int EditorNode::_next_unsaved_scene() {
for (int i = 0; i < editor_data.get_edited_scene_count(); i++) { for (int i = 0; i < editor_data.get_edited_scene_count(); i++) {
if (!editor_data.get_edited_scene_root(i))
continue;
int current = editor_data.get_edited_scene(); int current = editor_data.get_edited_scene();
bool unsaved = (i == current) ? saved_version != editor_data.get_undo_redo().get_version() : editor_data.get_scene_version(i) != 0; bool unsaved = (i == current) ? saved_version != editor_data.get_undo_redo().get_version() : editor_data.get_scene_version(i) != 0;
if (unsaved) { if (unsaved) {
@ -4383,6 +4385,10 @@ void EditorNode::_scene_tab_closed(int p_tab) {
current_option = SCENE_TAB_CLOSE; current_option = SCENE_TAB_CLOSE;
tab_closing = p_tab; tab_closing = p_tab;
Node *scene = editor_data.get_edited_scene_root(p_tab); Node *scene = editor_data.get_edited_scene_root(p_tab);
if (!scene) {
_discard_changes();
return;
}
bool unsaved = (p_tab == editor_data.get_edited_scene()) ? bool unsaved = (p_tab == editor_data.get_edited_scene()) ?
saved_version != editor_data.get_undo_redo().get_version() : saved_version != editor_data.get_undo_redo().get_version() :