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

Merge pull request #9761 from Noshyaar/pr-fix

Browse source 
ScriptEditor: suppress get_child errors
This commit is contained in:
Rémi Verschelde 2017-07-23 13:09:47 +02:00 committed by GitHub
commit 50ab88bf15
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
editor/plugins/script_editor_plugin.cpp
View file

@ -32,13 +32,13 @@
#include "editor/editor_node.h" #include "editor/editor_node.h"
#include "editor/editor_settings.h" #include "editor/editor_settings.h"
#include "editor/script_editor_debugger.h" #include "editor/script_editor_debugger.h"
#include "project_settings.h"
#include "io/resource_loader.h" #include "io/resource_loader.h"
#include "io/resource_saver.h" #include "io/resource_saver.h"
#include "os/file_access.h" #include "os/file_access.h"
#include "os/input.h" #include "os/input.h"
#include "os/keyboard.h" #include "os/keyboard.h"
#include "os/os.h" #include "os/os.h"
#include "project_settings.h"
#include "scene/main/viewport.h" #include "scene/main/viewport.h"
/*** SCRIPT EDITOR ****/ /*** SCRIPT EDITOR ****/
@ -1316,7 +1316,8 @@ void ScriptEditor::ensure_focus_current() {
int cidx = tab_container->get_current_tab(); int cidx = tab_container->get_current_tab();
if (cidx < 0 || cidx >= tab_container->get_tab_count()) if (cidx < 0 || cidx >= tab_container->get_tab_count())
; return;
Control *c = tab_container->get_child(cidx)->cast_to<Control>(); Control *c = tab_container->get_child(cidx)->cast_to<Control>();
if (!c) if (!c)
return; return;
@ -1406,6 +1407,11 @@ struct _ScriptEditorItemData {
}; };
void ScriptEditor::_update_members_overview_visibility() { void ScriptEditor::_update_members_overview_visibility() {
int selected = tab_container->get_current_tab();
if (selected < 0 || selected >= tab_container->get_child_count())
return;
Node *current = tab_container->get_child(tab_container->get_current_tab()); Node *current = tab_container->get_child(tab_container->get_current_tab());
ScriptEditorBase *se = current->cast_to<ScriptEditorBase>(); ScriptEditorBase *se = current->cast_to<ScriptEditorBase>();
if (!se) { if (!se) {
@ -1423,6 +1429,10 @@ void ScriptEditor::_update_members_overview_visibility() {
void ScriptEditor::_update_members_overview() { void ScriptEditor::_update_members_overview() {
members_overview->clear(); members_overview->clear();
int selected = tab_container->get_current_tab();
if (selected < 0 || selected >= tab_container->get_child_count())
return;
Node *current = tab_container->get_child(tab_container->get_current_tab()); Node *current = tab_container->get_child(tab_container->get_current_tab());
ScriptEditorBase *se = current->cast_to<ScriptEditorBase>(); ScriptEditorBase *se = current->cast_to<ScriptEditorBase>();
if (!se) { if (!se) {