diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-01-25 10:30:47 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-01-25 10:30:47 -0300 |
| commit | 5245adcf81dd61ddb4eac048f6b004f3f455d7ed (patch) | |
| tree | 272c46c2ee422d9fe6d4dfaeca51fa52c264ffb3 /core/io | |
| parent | 07e79094802a2eb2d7c0cd64cecf673db386ec5a (diff) | |
| parent | 87517c564b83218871ac53afdad375a9501e6cb8 (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'core/io')
| -rw-r--r-- | core/io/packet_peer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/io/packet_peer.cpp b/core/io/packet_peer.cpp index 6cb3daa7ac..973a2ec9a5 100644 --- a/core/io/packet_peer.cpp +++ b/core/io/packet_peer.cpp @@ -243,7 +243,7 @@ int PacketPeerStream::get_max_packet_size() const { void PacketPeerStream::set_stream_peer(const Ref<StreamPeer> &p_peer) { - ERR_FAIL_COND(p_peer.is_null()); + //ERR_FAIL_COND(p_peer.is_null()); if (p_peer.ptr() != peer.ptr()) { ring_buffer.advance_read(ring_buffer.data_left()); // reset the ring buffer |