diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-06-15 00:08:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-15 00:08:44 +0200 |
| commit | dc6642bc13a511a93e358bb25391131bd7e19e45 (patch) | |
| tree | d2a58e18dc1dcefb2f30fab7fd8359edcc382a70 /platform | |
| parent | 2b62872547f11debfe45a4eb697b36ef05fbf2eb (diff) | |
| parent | b76275ab12b8d12dd6458d951d2e4f37572df1a8 (diff) | |
Merge pull request #9102 from Faless/debugger_listen_show_error
Editor now shows error when debug port is in use
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/export/export.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 84fc4f10bf..51597526ab 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -1714,7 +1714,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 = GlobalConfig::get_singleton()->get("network/debug/remote_port"); + int port = (int)EditorSettings::get_singleton()->get("network/debug/remote_port"); args.clear(); args.push_back("reverse"); args.push_back("tcp:"+itos(port)); @@ -2993,7 +2993,7 @@ public: args.push_back("--remove-all"); err = OS::get_singleton()->execute(adb, args, true, NULL, NULL, &rv); - int port = GlobalConfig::get_singleton()->get("network/debug/remote_port"); + int port = (int)EditorSettings::get_singleton()->get("network/debug/remote_port"); args.clear(); args.push_back("reverse"); args.push_back("tcp:" + itos(port)); |