piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Qt/NetPlayDialog: Fix duplicate messages

Browse Source
This commit is contained in:
spycrab
2018-05-10 19:26:42 +02:00
parent 7550389c72
commit 6ea2b2e7e5
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp
View File

@ -18,7 +18,7 @@
#include <QProgressDialog> #include <QProgressDialog>
#include <QPushButton> #include <QPushButton>
#include <QSpinBox> #include <QSpinBox>
#include <QTextEdit> #include <QTextBrowser>
#include <sstream> #include <sstream>
@ -96,7 +96,7 @@ void NetPlayDialog::CreateMainLayout()
void NetPlayDialog::CreateChatLayout() void NetPlayDialog::CreateChatLayout()
{ {
m_chat_box = new QGroupBox(tr("Chat")); m_chat_box = new QGroupBox(tr("Chat"));
m_chat_edit = new QTextEdit; m_chat_edit = new QTextBrowser;
m_chat_type_edit = new QLineEdit; m_chat_type_edit = new QLineEdit;
m_chat_send_button = new QPushButton(tr("Send")); m_chat_send_button = new QPushButton(tr("Send"));
@ -170,6 +170,9 @@ void NetPlayDialog::ConnectWidgets()
// Other // Other
connect(m_buffer_size_box, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), connect(m_buffer_size_box, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
[this](int value) { [this](int value) {
if (value == m_buffer_size)
return;
if (Settings::Instance().GetNetPlayServer() != nullptr) if (Settings::Instance().GetNetPlayServer() != nullptr)
Settings::Instance().GetNetPlayServer()->AdjustPadBufferSize(value); Settings::Instance().GetNetPlayServer()->AdjustPadBufferSize(value);
}); });
@ -288,6 +291,7 @@ void NetPlayDialog::show(std::string nickname, bool use_traversal)
{ {
m_nickname = nickname; m_nickname = nickname;
m_use_traversal = use_traversal; m_use_traversal = use_traversal;
m_buffer_size = 0;
m_room_box->clear(); m_room_box->clear();
m_chat_edit->clear(); m_chat_edit->clear();
@ -488,6 +492,8 @@ void NetPlayDialog::OnPadBufferChanged(u32 buffer)
{ {
QueueOnObject(this, [this, buffer] { m_buffer_size_box->setValue(buffer); }); QueueOnObject(this, [this, buffer] { m_buffer_size_box->setValue(buffer); });
DisplayMessage(tr("Buffer size changed to %1").arg(buffer), ""); DisplayMessage(tr("Buffer size changed to %1").arg(buffer), "");
m_buffer_size = static_cast<int>(buffer);
} }
void NetPlayDialog::OnDesync(u32 frame, const std::string& player) void NetPlayDialog::OnDesync(u32 frame, const std::string& player)

1
Source/Core/DolphinQt2/NetPlay/NetPlayDialog.h
View File

@ -106,4 +106,5 @@ private:
GameListModel* m_game_list_model = nullptr; GameListModel* m_game_list_model = nullptr;
bool m_use_traversal = false; bool m_use_traversal = false;
bool m_is_copy_button_retry = false; bool m_is_copy_button_retry = false;
int m_buffer_size = 0;
}; };