diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2017-05-08 22:22:28 +0200 |
|---|---|---|
| committer | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2017-05-09 15:05:45 +0200 |
| commit | 98eb58a93cb34f42e42e6ee4f9f74fc15d4e9d85 (patch) | |
| tree | a7d9477d840b7b11ee35ed29754688d6d12ef86a | |
| parent | a1c41be56977e22e953191dd9e90621d09f294cc (diff) | |
Allow selecting editor debug host and port.
Possibly fixes various editor<->debugger connection related problems.
| -rw-r--r-- | editor/editor_run.cpp | 3 | ||||
| -rw-r--r-- | editor/editor_settings.cpp | 2 | ||||
| -rw-r--r-- | main/main.cpp | 5 |
3 files changed, 5 insertions, 5 deletions
diff --git a/editor/editor_run.cpp b/editor/editor_run.cpp index d36b8cece5..12bfd9bc50 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 7d7db5ac75..f70f34af4c 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; diff --git a/main/main.cpp b/main/main.cpp index 33095e8599..ea7d8e075c 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -588,8 +588,9 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph ScriptDebuggerRemote *sdr = memnew(ScriptDebuggerRemote); uint16_t debug_port = GLOBAL_GET("network/debug/remote_port"); if (debug_host.find(":") != -1) { - debug_port = debug_host.get_slicec(':', 1).to_int(); - debug_host = debug_host.get_slicec(':', 0); + int sep_pos = debug_host.find_last(":"); + debug_port = debug_host.substr(sep_pos + 1, debug_host.length()).to_int(); + debug_host = debug_host.substr(0, sep_pos); } Error derr = sdr->connect_to_host(debug_host, debug_port); |