summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt/Config/ControllersWindow.cpp
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2019-11-03 15:03:58 +0100
committerJosJuice <josjuice@gmail.com>2019-11-03 15:03:58 +0100
commitef1bae5320b4a9484a1d8acd0c691d2ad44571c5 (patch)
tree63ddda96b8a7208205f1a5c0714ac3c649a11d86 /Source/Core/DolphinQt/Config/ControllersWindow.cpp
parent0f4c971326ae9389b3ad55b0fefacb708d148f4d (diff)
DolphinQt: Fix the enabling/disabling of ControllersWindow buttons
Without this change, calling OnEmulationStateChanged undoes part of the enabling/disabling that OnWiimoteModeChanged has done.
Diffstat (limited to 'Source/Core/DolphinQt/Config/ControllersWindow.cpp')
-rw-r--r--Source/Core/DolphinQt/Config/ControllersWindow.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/Source/Core/DolphinQt/Config/ControllersWindow.cpp b/Source/Core/DolphinQt/Config/ControllersWindow.cpp
index 1df7b1d9a7..3018dc27a1 100644
--- a/Source/Core/DolphinQt/Config/ControllersWindow.cpp
+++ b/Source/Core/DolphinQt/Config/ControllersWindow.cpp
@@ -377,13 +377,15 @@ void ControllersWindow::OnWiimoteRefreshPressed()
void ControllersWindow::OnEmulationStateChanged(bool running)
{
+ const bool passthrough = SConfig::GetInstance().m_bt_passthrough_enabled;
+
if (!SConfig::GetInstance().bWii)
{
- m_wiimote_sync->setEnabled(!running);
- m_wiimote_reset->setEnabled(!running);
+ m_wiimote_sync->setEnabled(!running && passthrough);
+ m_wiimote_reset->setEnabled(!running && passthrough);
for (size_t i = 0; i < m_wiimote_groups.size(); i++)
- m_wiimote_boxes[i]->setEnabled(!running);
+ m_wiimote_boxes[i]->setEnabled(!running && !passthrough);
}
m_wiimote_emu->setEnabled(!running);
@@ -391,9 +393,9 @@ void ControllersWindow::OnEmulationStateChanged(bool running)
if (!SConfig::GetInstance().bWii)
{
- m_wiimote_real_balance_board->setEnabled(!running);
- m_wiimote_continuous_scanning->setEnabled(!running);
- m_wiimote_speaker_data->setEnabled(!running);
+ m_wiimote_real_balance_board->setEnabled(!running && !passthrough);
+ m_wiimote_continuous_scanning->setEnabled(!running && !passthrough);
+ m_wiimote_speaker_data->setEnabled(!running && !passthrough);
}
}