diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-03-23 10:04:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-23 10:04:05 +0100 |
| commit | b5af63fc8c9691490f566c9c02d9a4a2174a9e3f (patch) | |
| tree | 758f7571667bd6098df11c377712c846e8e94193 | |
| parent | f672fd768623f2a819593080eab16a0cbbe4f05c (diff) | |
| parent | f5147befb68cc2a021034a55ad64a4e1fae4bba2 (diff) | |
Merge pull request #17679 from ivodopiviz/external-editor-switch
Prevented external editor from running multiple times
| -rw-r--r-- | editor/editor_node.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 36ea90ed66..94b4754478 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -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())) { |