From 591c8837e2fef95750172d454c08dab4a49e4f6b Mon Sep 17 00:00:00 2001 From: spycrab Date: Tue, 20 Mar 2018 10:12:11 +0100 Subject: Qt: Replace "OK" with "Close" buttons --- Source/Core/DolphinQt2/Config/ControllersWindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/DolphinQt2/Config/ControllersWindow.cpp') diff --git a/Source/Core/DolphinQt2/Config/ControllersWindow.cpp b/Source/Core/DolphinQt2/Config/ControllersWindow.cpp index 6e1fe5f14b..cb62e6e50d 100644 --- a/Source/Core/DolphinQt2/Config/ControllersWindow.cpp +++ b/Source/Core/DolphinQt2/Config/ControllersWindow.cpp @@ -223,7 +223,7 @@ void ControllersWindow::CreateAdvancedLayout() void ControllersWindow::CreateMainLayout() { auto* layout = new QVBoxLayout(); - m_button_box = new QDialogButtonBox(QDialogButtonBox::Ok); + m_button_box = new QDialogButtonBox(QDialogButtonBox::Close); layout->addWidget(m_gc_box); layout->addWidget(m_wiimote_box); @@ -235,6 +235,7 @@ void ControllersWindow::CreateMainLayout() void ControllersWindow::ConnectWidgets() { + connect(m_button_box, &QDialogButtonBox::rejected, this, &QDialog::reject); connect(&Settings::Instance(), &Settings::EmulationStateChanged, this, [=](Core::State state) { OnEmulationStateChanged(state != Core::State::Uninitialized); }); @@ -253,7 +254,6 @@ void ControllersWindow::ConnectWidgets() &ControllersWindow::OnBluetoothPassthroughResetPressed); connect(m_wiimote_refresh, &QPushButton::clicked, this, &ControllersWindow::OnWiimoteRefreshPressed); - connect(m_button_box, &QDialogButtonBox::accepted, this, &ControllersWindow::accept); for (size_t i = 0; i < m_wiimote_groups.size(); i++) { -- cgit v1.2.3