diff options
author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2021-12-05 06:40:42 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-05 06:40:42 +0100 |
commit | 8310d40646a1421809bcd46381d7a503c6781db3 (patch) | |
tree | 6fdec47979edaa02a48191905e69a542cf16b80a /editor/editor_node.cpp | |
parent | 2a9dd654bc0197dd864df61b5b37e302022c2871 (diff) | |
parent | de7873c2d87c3ee8af8c27e35f49767fcc384e75 (diff) |
Merge pull request #53241 from nathanfranke/auto-increment-debugger-port
[4.x] Auto-Increment Debugger Port (And a bit of cleanup)
Diffstat (limited to 'editor/editor_node.cpp')
-rw-r--r-- | editor/editor_node.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 6aaf0b063f..ae13b59f63 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -2315,8 +2315,6 @@ void EditorNode::_run(bool p_current, const String &p_custom) { play_custom_scene_button->set_icon(gui_base->get_theme_icon(SNAME("PlayCustom"), SNAME("EditorIcons"))); String run_filename; - String args; - bool skip_breakpoints; if (p_current || (editor_data.get_edited_scene_root() && p_custom != String() && p_custom == editor_data.get_edited_scene_root()->get_scene_file_path())) { Node *scene = editor_data.get_edited_scene_root(); @@ -2371,17 +2369,11 @@ void EditorNode::_run(bool p_current, const String &p_custom) { make_bottom_panel_item_visible(log); } - List<String> breakpoints; - editor_data.get_editor_breakpoints(&breakpoints); - - args = ProjectSettings::get_singleton()->get("editor/run/main_run_args"); - skip_breakpoints = EditorDebuggerNode::get_singleton()->is_skip_breakpoints(); - EditorDebuggerNode::get_singleton()->start(); - Error error = editor_run.run(run_filename, args, breakpoints, skip_breakpoints); + Error error = editor_run.run(run_filename); if (error != OK) { EditorDebuggerNode::get_singleton()->stop(); - show_accept(TTR("Could not start subprocess!"), TTR("OK")); + show_accept(TTR("Could not start subprocess(es)!"), TTR("OK")); return; } |