From 61d336003308f8a6b49f8ed89278a041fe5566ae Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Fri, 23 May 2014 07:20:40 -0400 Subject: [PATCH] Limit netplay chat messages to 2000 characters. There's not really a good reason to be sending messages longer than that, and very long messages can hang dolphin for quite a long time. --- Source/Core/DolphinWX/NetWindow.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/Core/DolphinWX/NetWindow.cpp b/Source/Core/DolphinWX/NetWindow.cpp index bb7044e313..4ac4ff7822 100644 --- a/Source/Core/DolphinWX/NetWindow.cpp +++ b/Source/Core/DolphinWX/NetWindow.cpp @@ -335,6 +335,7 @@ NetPlayDiag::NetPlayDiag(wxWindow* const parent, const CGameListCtrl* const game m_chat_msg_text = new wxTextCtrl(panel, wxID_ANY, wxEmptyString , wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER); m_chat_msg_text->Bind(wxEVT_TEXT_ENTER, &NetPlayDiag::OnChat, this); + m_chat_msg_text->SetMaxLength(2000); wxButton* const chat_msg_btn = new wxButton(panel, wxID_ANY, _("Send")); chat_msg_btn->Bind(wxEVT_BUTTON, &NetPlayDiag::OnChat, this); @@ -425,6 +426,8 @@ void NetPlayDiag::OnChat(wxCommandEvent&) if (s.Length()) { + if (s.Length() > 2000) + s.erase(2000); netplay_client->SendChatMessage(WxStrToStr(s)); m_chat_text->AppendText(s.Prepend(" >> ").Append('\n')); m_chat_msg_text->Clear();