summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt/Config/ControllersWindow.cpp
diff options
context:
space:
mode:
authorConnor McLaughlin <stenzek@gmail.com>2019-11-08 10:27:49 +1000
committerGitHub <noreply@github.com>2019-11-08 10:27:49 +1000
commitb554b636bd8a96634203fb402680b4d58b4dba8c (patch)
tree4095eef24821e0c47567f199b748a9bc8fba5fb6 /Source/Core/DolphinQt/Config/ControllersWindow.cpp
parent5440be96e744fffcdc4bb5e030a202deef7a1e1d (diff)
parentef1bae5320b4a9484a1d8acd0c691d2ad44571c5 (diff)
Merge pull request #8449 from JosJuice/disable-bt-pt-buttons
DolphinQt: Fix the enabling/disabling of ControllersWindow buttons
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);
}
}