summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-12-22 12:37:59 +0100
committerGitHub <noreply@github.com>2019-12-22 12:37:59 +0100
commit9410d0c792b95abed8173de808d1da38546e0c64 (patch)
tree3d69886be1d903575362c828af3c036d21f3c6c7
parent4bec32a11e4d8483815e9c56273b9e183253644e (diff)
parentf8f56963943b91c0ad78fa4b7728596d459c5ac0 (diff)
Merge pull request #34516 from Faless/debugger/output_buffer_size
Correct size for PacketPeerStream in Debugger.
-rw-r--r--editor/script_editor_debugger.cpp2
-rw-r--r--scene/debugger/script_debugger_remote.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp
index f854af0c8d..fd34d8f5d6 100644
--- a/editor/script_editor_debugger.cpp
+++ b/editor/script_editor_debugger.cpp
@@ -2247,7 +2247,7 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor) {
add_constant_override("margin_right", -EditorNode::get_singleton()->get_gui_base()->get_stylebox("BottomPanelDebuggerOverride", "EditorStyles")->get_margin(MARGIN_RIGHT));
ppeer = Ref<PacketPeerStream>(memnew(PacketPeerStream));
- ppeer->set_input_buffer_max_size(1024 * 1024 * 8); //8mb should be enough
+ ppeer->set_input_buffer_max_size((1024 * 1024 * 8) - 4); // 8 MiB should be enough, minus 4 bytes for separator.
editor = p_editor;
editor->get_inspector()->connect("object_id_selected", this, "_scene_tree_property_select_object");
diff --git a/scene/debugger/script_debugger_remote.cpp b/scene/debugger/script_debugger_remote.cpp
index c3c6a088cb..1b37a7dbdb 100644
--- a/scene/debugger/script_debugger_remote.cpp
+++ b/scene/debugger/script_debugger_remote.cpp
@@ -1257,7 +1257,7 @@ ScriptDebuggerRemote::ScriptDebuggerRemote() :
scene_tree(NULL) {
packet_peer_stream->set_stream_peer(tcp_client);
- packet_peer_stream->set_output_buffer_max_size(1024 * 1024 * 8); //8mb should be way more than enough
+ packet_peer_stream->set_output_buffer_max_size((1024 * 1024 * 8) - 4); // 8 MiB should be way more than enough, minus 4 bytes for separator.
phl.printfunc = _print_handler;
phl.userdata = this;