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

Merge pull request #8474 from allkhor/pr-fix-cherry-2.1

Browse source 
ScriptEditor: Fixes bug where menu option would be handled twice (2.1)
This commit is contained in:
Rémi Verschelde 2017-04-24 11:22:14 +02:00 committed by GitHub
commit ea89c56bfb
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
editor/plugins/script_editor_plugin.cpp
View file

@ -1552,7 +1552,7 @@ void ScriptEditor::_menu_option(int p_option) {
} }
} }
} }
} } else {
EditorHelp *help = tab_container->get_current_tab_control()->cast_to<EditorHelp>(); EditorHelp *help = tab_container->get_current_tab_control()->cast_to<EditorHelp>();
if (help) { if (help) {
@ -1573,6 +1573,7 @@ void ScriptEditor::_menu_option(int p_option) {
} break; } break;
} }
} }
}
} }
void ScriptEditor::_tab_changed(int p_which) { void ScriptEditor::_tab_changed(int p_which) {