Merge pull request #17679 from ivodopiviz/external-editor-switch

Prevented external editor from running multiple times
This commit is contained in:
Rémi Verschelde 2018-03-23 10:04:05 +01:00 committed by GitHub
commit b5af63fc8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1599,7 +1599,8 @@ void EditorNode::_edit_current() {
// special case if use of external editor is true
if (main_plugin->get_name() == "Script" && (bool(EditorSettings::get_singleton()->get("text_editor/external/use_external_editor")) || overrides_external_editor(current_obj))) {
main_plugin->edit(current_obj);
if (!changing_scene)
main_plugin->edit(current_obj);
}
else if (main_plugin != editor_plugin_screen && (!ScriptEditor::get_singleton() || !ScriptEditor::get_singleton()->is_visible_in_tree() || ScriptEditor::get_singleton()->can_take_away_focus())) {