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

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

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>();
if (help) {
@ -1574,6 +1574,7 @@ void ScriptEditor::_menu_option(int p_option) {
}
}
}
}
void ScriptEditor::_tab_changed(int p_which) {