diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2020-05-12 18:02:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-12 18:02:38 +0200 |
commit | 2231673d42a9f20c8778b068102ae46261a6fb69 (patch) | |
tree | 9d93f43c983398f96e6a5ae7f39d80559398402a /core/debugger/remote_debugger_peer.cpp | |
parent | 6dfea347b0f957e2689a127f025988f9aae1ab71 (diff) | |
parent | 3097c2da963fe355c81816a74824170b6dce697c (diff) |
Merge pull request #37099 from Faless/js/debugger_4.0
WebSocket profiler for HTML5 platform [4.0]
Diffstat (limited to 'core/debugger/remote_debugger_peer.cpp')
-rw-r--r-- | core/debugger/remote_debugger_peer.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/core/debugger/remote_debugger_peer.cpp b/core/debugger/remote_debugger_peer.cpp index ed04431177..458c46df93 100644 --- a/core/debugger/remote_debugger_peer.cpp +++ b/core/debugger/remote_debugger_peer.cpp @@ -218,9 +218,8 @@ void RemoteDebuggerPeerTCP::_poll() { } } -Ref<RemoteDebuggerPeer> RemoteDebuggerPeer::create_from_uri(const String p_uri) { - if (!p_uri.begins_with("tcp://")) - return Ref<RemoteDebuggerPeer>(); // Only TCP supported for now, more to come. +RemoteDebuggerPeer *RemoteDebuggerPeerTCP::create(const String &p_uri) { + ERR_FAIL_COND_V(!p_uri.begins_with("tcp://"), nullptr); String debug_host = p_uri.replace("tcp://", ""); uint16_t debug_port = 6007; @@ -230,10 +229,13 @@ Ref<RemoteDebuggerPeer> RemoteDebuggerPeer::create_from_uri(const String p_uri) debug_port = debug_host.substr(sep_pos + 1).to_int(); debug_host = debug_host.substr(0, sep_pos); } - Ref<RemoteDebuggerPeerTCP> peer = Ref<RemoteDebuggerPeer>(memnew(RemoteDebuggerPeerTCP)); + + RemoteDebuggerPeerTCP *peer = memnew(RemoteDebuggerPeerTCP); Error err = peer->connect_to_host(debug_host, debug_port); - if (err != OK) - return Ref<RemoteDebuggerPeer>(); + if (err != OK) { + memdelete(peer); + return nullptr; + } return peer; } |