浏览代码

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

Prevented external editor from running multiple times
Rémi Verschelde 7 年之前
父节点
当前提交
b5af63fc8c
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      editor/editor_node.cpp

+ 2 - 1
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())) {