diff options
| -rw-r--r-- | editor/editor_import_export.cpp | 2 | ||||
| -rw-r--r-- | editor/editor_run.cpp | 2 | ||||
| -rw-r--r-- | editor/editor_settings.cpp | 4 | ||||
| -rw-r--r-- | editor/plugins/script_editor_plugin.cpp | 3 | ||||
| -rw-r--r-- | platform/android/export/export.cpp | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/editor/editor_import_export.cpp b/editor/editor_import_export.cpp index 5bd3cf29e..824003360 100644 --- a/editor/editor_import_export.cpp +++ b/editor/editor_import_export.cpp @@ -1047,7 +1047,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("debug/debug_port", 6007))); + r_flags.push_back(host + ":" + String::num(GLOBAL_DEF("network/debug_port", 6007))); List<String> breakpoints; ScriptEditor::get_singleton()->get_breakpoints(&breakpoints); diff --git a/editor/editor_run.cpp b/editor/editor_run.cpp index 40ac16c92..c7f151455 100644 --- a/editor/editor_run.cpp +++ b/editor/editor_run.cpp @@ -49,7 +49,7 @@ Error EditorRun::run(const String &p_scene, const String p_custom_args, const Li if (true) { args.push_back("-rdebug"); - args.push_back(remote_host + ":" + String::num(GLOBAL_DEF("debug/debug_port", 6007))); + args.push_back(remote_host + ":" + String::num(GLOBAL_DEF("network/debug_port", 6007))); } args.push_back("-epid"); diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index e58a02c0c..2a6fe3125 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -413,6 +413,7 @@ void EditorSettings::setup_network() { String lip; String hint; String current = get("network/debug_host"); + int port = has("network/debug_port") ? (int)get("network/debug_port") : 6007; for (List<IP_Address>::Element *E = local_ip.front(); E; E = E->next()) { @@ -429,6 +430,9 @@ void EditorSettings::setup_network() { set("network/debug_host", lip); add_property_hint(PropertyInfo(Variant::STRING, "network/debug_host", PROPERTY_HINT_ENUM, hint)); + + set("network/debug_port", port); + add_property_hint(PropertyInfo(Variant::INT, "network/debug_port", PROPERTY_HINT_RANGE, "1,65535,1")); } void EditorSettings::save() { diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index 997ab5015..4696c1167 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -37,7 +37,6 @@ #include "os/file_access.h" #include "os/input.h" #include "os/keyboard.h" -#include "os/keyboard.h" #include "os/os.h" #include "scene/main/viewport.h" @@ -2158,8 +2157,6 @@ void ScriptEditor::_editor_play() { debug_menu->get_popup()->set_item_disabled(debug_menu->get_popup()->get_item_index(DEBUG_STEP), true); debug_menu->get_popup()->set_item_disabled(debug_menu->get_popup()->get_item_index(DEBUG_BREAK), false); debug_menu->get_popup()->set_item_disabled(debug_menu->get_popup()->get_item_index(DEBUG_CONTINUE), true); - - //debugger_gui->start_listening(Globals::get_singleton()->get("debug/debug_port")); } void ScriptEditor::_editor_pause() { diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 944840de7..a94241ff9 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -1651,7 +1651,7 @@ Error EditorExportPlatformAndroid::run(int p_device, int p_flags) { args.push_back("--remove-all"); err = OS::get_singleton()->execute(adb, args, true, NULL, NULL, &rv); - int port = Globals::get_singleton()->get("debug/debug_port"); + int port = Globals::get_singleton()->get("network/debug_port"); args.clear(); args.push_back("reverse"); args.push_back("tcp:" + itos(port)); |