diff options
| author | Rémi Verschelde | 2017-06-15 00:08:44 +0200 |
|---|---|---|
| committer | GitHub | 2017-06-15 00:08:44 +0200 |
| commit | dc6642bc13a511a93e358bb25391131bd7e19e45 (patch) | |
| tree | d2a58e18dc1dcefb2f30fab7fd8359edcc382a70 /editor/editor_export.cpp | |
| parent | 2b62872547f11debfe45a4eb697b36ef05fbf2eb (diff) | |
| parent | b76275ab12b8d12dd6458d951d2e4f37572df1a8 (diff) | |
| download | godot-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 'editor/editor_export.cpp')
| -rw-r--r-- | editor/editor_export.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/editor/editor_export.cpp b/editor/editor_export.cpp index cb1b958cc..a19819a1f 100644 --- a/editor/editor_export.cpp +++ b/editor/editor_export.cpp @@ -211,6 +211,7 @@ EditorExportPreset::EditorExportPreset() { void EditorExportPlatform::gen_debug_flags(Vector<String> &r_flags, int p_flags) { String host = EditorSettings::get_singleton()->get("network/debug/remote_host"); + int remote_port = (int)EditorSettings::get_singleton()->get("network/debug/remote_port"); if (p_flags & DEBUG_FLAG_REMOTE_DEBUG_LOCALHOST) host = "localhost"; @@ -230,7 +231,7 @@ void EditorExportPlatform::gen_debug_flags(Vector<String> &r_flags, int p_flags) r_flags.push_back("-rdebug"); - r_flags.push_back(host + ":" + String::num(GLOBAL_DEF("network/debug/remote_port", 6007))); + r_flags.push_back(host + ":" + String::num(remote_port)); List<String> breakpoints; ScriptEditor::get_singleton()->get_breakpoints(&breakpoints); @@ -621,6 +622,7 @@ Error EditorExportPlatform::save_zip(const Ref<EditorExportPreset> &p_preset, co void EditorExportPlatform::gen_export_flags(Vector<String> &r_flags, int p_flags) { String host = EditorSettings::get_singleton()->get("network/debug/remote_host"); + int remote_port = (int)EditorSettings::get_singleton()->get("network/debug/remote_port"); if (p_flags & DEBUG_FLAG_REMOTE_DEBUG_LOCALHOST) host = "localhost"; @@ -640,7 +642,7 @@ void EditorExportPlatform::gen_export_flags(Vector<String> &r_flags, int p_flags r_flags.push_back("-rdebug"); - r_flags.push_back(host + ":" + String::num(GLOBAL_DEF("network/debug/remote_port", 6007))); + r_flags.push_back(host + ":" + String::num(remote_port)); List<String> breakpoints; ScriptEditor::get_singleton()->get_breakpoints(&breakpoints); @@ -2109,6 +2111,7 @@ static int _get_pad(int p_alignment, int p_n) { void EditorExportPlatform::gen_export_flags(Vector<String> &r_flags, int p_flags) { String host = EditorSettings::get_singleton()->get("network/debug/remote_host"); + int remote_port = (int)EditorSettings::get_singleton()->get("network/debug/remote_port"); if (p_flags&EXPORT_REMOTE_DEBUG_LOCALHOST) host="localhost"; @@ -2128,7 +2131,7 @@ void EditorExportPlatform::gen_export_flags(Vector<String> &r_flags, int p_flags r_flags.push_back("-rdebug"); - r_flags.push_back(host+":"+String::num(GLOBAL_DEF("network/debug/remote_port", 6007))); + r_flags.push_back(host+":"+String::num(remote_port)); List<String> breakpoints; ScriptEditor::get_singleton()->get_breakpoints(&breakpoints); |