ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DolphinQt: Fix the enabling/disabling of ControllersWindow buttons 

Without this change, calling OnEmulationStateChanged undoes part
of the enabling/disabling that OnWiimoteModeChanged has done.
This commit is contained in:
JosJuice 2019-11-03 15:03:58 +01:00
parent 0f4c971326
commit ef1bae5320
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/DolphinQt/Config/ControllersWindow.cpp
View File

@ -377,13 +377,15 @@ void ControllersWindow::OnWiimoteRefreshPressed()
void ControllersWindow::OnEmulationStateChanged(bool running) void ControllersWindow::OnEmulationStateChanged(bool running)
{ {
const bool passthrough = SConfig::GetInstance().m_bt_passthrough_enabled;
if (!SConfig::GetInstance().bWii) if (!SConfig::GetInstance().bWii)
{ {
m_wiimote_sync->setEnabled(!running); m_wiimote_sync->setEnabled(!running && passthrough);
m_wiimote_reset->setEnabled(!running); m_wiimote_reset->setEnabled(!running && passthrough);
for (size_t i = 0; i < m_wiimote_groups.size(); i++) 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); m_wiimote_emu->setEnabled(!running);
@ -391,9 +393,9 @@ void ControllersWindow::OnEmulationStateChanged(bool running)
if (!SConfig::GetInstance().bWii) if (!SConfig::GetInstance().bWii)
{ {
m_wiimote_real_balance_board->setEnabled(!running); m_wiimote_real_balance_board->setEnabled(!running && !passthrough);
m_wiimote_continuous_scanning->setEnabled(!running); m_wiimote_continuous_scanning->setEnabled(!running && !passthrough);
m_wiimote_speaker_data->setEnabled(!running); m_wiimote_speaker_data->setEnabled(!running && !passthrough);
} }
} }