aboutsummaryrefslogtreecommitdiff
path: root/main/main.cpp
diff options
context:
space:
mode:
authorRémi Verschelde2017-06-15 00:08:44 +0200
committerGitHub2017-06-15 00:08:44 +0200
commitdc6642bc13a511a93e358bb25391131bd7e19e45 (patch)
treed2a58e18dc1dcefb2f30fab7fd8359edcc382a70 /main/main.cpp
parent2b62872547f11debfe45a4eb697b36ef05fbf2eb (diff)
parentb76275ab12b8d12dd6458d951d2e4f37572df1a8 (diff)
downloadgodot-dc6642bc13a511a93e358bb25391131bd7e19e45.tar.gz
godot-dc6642bc13a511a93e358bb25391131bd7e19e45.tar.zst
godot-dc6642bc13a511a93e358bb25391131bd7e19e45.zip
Merge pull request #9102 from Faless/debugger_listen_show_error
Editor now shows error when debug port is in use
Diffstat (limited to 'main/main.cpp')
-rw-r--r--main/main.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/main/main.cpp b/main/main.cpp
index e13fb8d3d..e00c13659 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -581,12 +581,11 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
GLOBAL_DEF("memory/multithread/thread_rid_pool_prealloc", 60);
GLOBAL_DEF("network/debug/max_remote_stdout_chars_per_second", 2048);
- GLOBAL_DEF("network/debug/remote_port", 6007);
if (debug_mode == "remote") {
ScriptDebuggerRemote *sdr = memnew(ScriptDebuggerRemote);
- uint16_t debug_port = GLOBAL_GET("network/debug/remote_port");
+ uint16_t debug_port = 6007;
if (debug_host.find(":") != -1) {
int sep_pos = debug_host.find_last(":");
debug_port = debug_host.substr(sep_pos + 1, debug_host.length()).to_int();