aboutsummaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorFabio Alessandrelli2017-05-08 22:22:28 +0200
committerFabio Alessandrelli2017-05-09 15:05:45 +0200
commit98eb58a93cb34f42e42e6ee4f9f74fc15d4e9d85 (patch)
treea7d9477d840b7b11ee35ed29754688d6d12ef86a /editor
parenta1c41be56977e22e953191dd9e90621d09f294cc (diff)
downloadgodot-98eb58a93cb34f42e42e6ee4f9f74fc15d4e9d85.tar.gz
godot-98eb58a93cb34f42e42e6ee4f9f74fc15d4e9d85.tar.zst
godot-98eb58a93cb34f42e42e6ee4f9f74fc15d4e9d85.zip
Allow selecting editor debug host and port.
Possibly fixes various editor<->debugger connection related problems.
Diffstat (limited to 'editor')
-rw-r--r--editor/editor_run.cpp3
-rw-r--r--editor/editor_settings.cpp2
2 files changed, 2 insertions, 3 deletions
diff --git a/editor/editor_run.cpp b/editor/editor_run.cpp
index d36b8cece..12bfd9bc5 100644
--- a/editor/editor_run.cpp
+++ b/editor/editor_run.cpp
@@ -41,6 +41,7 @@ Error EditorRun::run(const String &p_scene, const String p_custom_args, const Li
List<String> args;
String resource_path = GlobalConfig::get_singleton()->get_resource_path();
+ String remote_host = EditorSettings::get_singleton()->get("network/debug_host");
if (resource_path != "") {
args.push_back("-path");
@@ -49,7 +50,7 @@ Error EditorRun::run(const String &p_scene, const String p_custom_args, const Li
if (true) {
args.push_back("-rdebug");
- args.push_back("localhost:" + String::num(GLOBAL_GET("network/debug/remote_port")));
+ args.push_back(remote_host + ":" + String::num(GLOBAL_GET("network/debug/remote_port")));
}
args.push_back("-epid");
diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp
index 7d7db5ac7..f70f34af4 100644
--- a/editor/editor_settings.cpp
+++ b/editor/editor_settings.cpp
@@ -412,8 +412,6 @@ void EditorSettings::setup_network() {
for (List<IP_Address>::Element *E = local_ip.front(); E; E = E->next()) {
String ip = E->get();
- if (ip == "127.0.0.1")
- continue;
if (lip == "")
lip = ip;