diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-06-15 00:08:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-15 00:08:44 +0200 |
| commit | dc6642bc13a511a93e358bb25391131bd7e19e45 (patch) | |
| tree | d2a58e18dc1dcefb2f30fab7fd8359edcc382a70 /editor/script_editor_debugger.cpp | |
| parent | 2b62872547f11debfe45a4eb697b36ef05fbf2eb (diff) | |
| parent | b76275ab12b8d12dd6458d951d2e4f37572df1a8 (diff) | |
| download | redot-engine-dc6642bc13a511a93e358bb25391131bd7e19e45.tar.gz | |
Merge pull request #9102 from Faless/debugger_listen_show_error
Editor now shows error when debug port is in use
Diffstat (limited to 'editor/script_editor_debugger.cpp')
| -rw-r--r-- | editor/script_editor_debugger.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp index 7f1e6023bf..6d22935dcb 100644 --- a/editor/script_editor_debugger.cpp +++ b/editor/script_editor_debugger.cpp @@ -1035,14 +1035,17 @@ void ScriptEditorDebugger::start() { EditorNode::get_singleton()->make_bottom_panel_item_visible(this); } - uint16_t port = GLOBAL_GET("network/debug/remote_port"); perf_history.clear(); for (int i = 0; i < Performance::MONITOR_MAX; i++) { perf_max[i] = 0; } - server->listen(port); + int remote_port = (int)EditorSettings::get_singleton()->get("network/debug/remote_port"); + if (server->listen(remote_port) != OK) { + EditorNode::get_log()->add_message(String("** Error listening on port ") + itos(remote_port) + String(" **")); + return; + } set_process(true); } |