diff options
| author | Fabio Alessandrelli | 2017-06-08 21:24:36 +0200 |
|---|---|---|
| committer | Rémi Verschelde | 2017-06-17 12:09:09 +0200 |
| commit | f6f8628ec9351671c5407f45a88294c1931a73b6 (patch) | |
| tree | 84fc21c111ad27b4bdacbfc5f0ca96f0dc47df2b | |
| parent | f1901d8e3f320c222b197ab96eedc31b5189776c (diff) | |
| download | godot-f6f8628ec9351671c5407f45a88294c1931a73b6.tar.gz godot-f6f8628ec9351671c5407f45a88294c1931a73b6.tar.zst godot-f6f8628ec9351671c5407f45a88294c1931a73b6.zip | |
Editor now shows error when debug port is in use
(cherry picked from commit fc1368bee00301ef7c789982474876c5a6ea9854)
| -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 0b050065c..9a90498c1 100644 --- a/editor/script_editor_debugger.cpp +++ b/editor/script_editor_debugger.cpp @@ -1029,14 +1029,17 @@ void ScriptEditorDebugger::start() { EditorNode::get_singleton()->make_bottom_panel_item_visible(this); } - uint16_t port = GLOBAL_DEF("debug/remote_port", 6007); 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); } |