diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2018-08-27 14:42:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-27 14:42:47 +0200 |
| commit | 2fc036bcc2546a78f5a202e88d7aaba78e67bcdf (patch) | |
| tree | 90ebee9717a42fd5ea5a1d1b8045621405c77346 /Source/Core | |
| parent | ea26ccbbe1682547a2ea6a3fc4a5983a72958a42 (diff) | |
| parent | f1bc17ab9ea69a3c041e79ed161f94c650600176 (diff) | |
Merge pull request #7367 from Techjar/qt-netplay-md5-close-on-chat
Qt/MD5Dialog: Fix pressing enter on NetPlay window causing dialog to close
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinQt/NetPlay/MD5Dialog.cpp | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/Source/Core/DolphinQt/NetPlay/MD5Dialog.cpp b/Source/Core/DolphinQt/NetPlay/MD5Dialog.cpp index ec8db64fc1..05094f089f 100644 --- a/Source/Core/DolphinQt/NetPlay/MD5Dialog.cpp +++ b/Source/Core/DolphinQt/NetPlay/MD5Dialog.cpp @@ -11,6 +11,7 @@ #include <QGroupBox> #include <QLabel> #include <QProgressBar> +#include <QPushButton> #include <QVBoxLayout> #include "Core/NetPlayClient.h" @@ -49,7 +50,7 @@ void MD5Dialog::CreateWidgets() m_main_layout = new QVBoxLayout; m_progress_box = new QGroupBox; m_progress_layout = new QVBoxLayout; - m_button_box = new QDialogButtonBox(QDialogButtonBox::Close); + m_button_box = new QDialogButtonBox(QDialogButtonBox::NoButton); m_check_label = new QLabel; m_progress_box->setLayout(m_progress_layout); @@ -90,6 +91,21 @@ void MD5Dialog::show(const QString& title) if (!client) return; + if (Settings::Instance().GetNetPlayServer()) + { + m_button_box->setStandardButtons(QDialogButtonBox::Cancel); + QPushButton* cancel_button = m_button_box->button(QDialogButtonBox::Cancel); + cancel_button->setAutoDefault(false); + cancel_button->setDefault(false); + } + else + { + m_button_box->setStandardButtons(QDialogButtonBox::Close); + QPushButton* close_button = m_button_box->button(QDialogButtonBox::Close); + close_button->setAutoDefault(false); + close_button->setDefault(false); + } + for (const auto* player : client->GetPlayers()) { m_progress_bars[player->pid] = new QProgressBar; @@ -138,6 +154,11 @@ void MD5Dialog::SetResult(int pid, const std::string& result) { m_check_label->setText(tr("The hashes do not match!")); } + + m_button_box->setStandardButtons(QDialogButtonBox::Close); + QPushButton* close_button = m_button_box->button(QDialogButtonBox::Close); + close_button->setAutoDefault(false); + close_button->setDefault(false); } } |