summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt2/Config/ControllersWindow.cpp
diff options
context:
space:
mode:
authorspycrab <spycrab@users.noreply.github.com>2018-05-13 12:16:30 +0200
committerspycrab <spycrab@users.noreply.github.com>2018-05-13 14:04:39 +0200
commit2ca75ae05a10b452c5f6d692eb3457513937c156 (patch)
tree8fa1e3a28e34216976f7dfce467dfcf5c38892f6 /Source/Core/DolphinQt2/Config/ControllersWindow.cpp
parente78235943eb5ada474f7ec5383f28521feeaf9a4 (diff)
Qt/ControllersWindow: Fix changing devices while emulation is running
Diffstat (limited to 'Source/Core/DolphinQt2/Config/ControllersWindow.cpp')
-rw-r--r--Source/Core/DolphinQt2/Config/ControllersWindow.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/Source/Core/DolphinQt2/Config/ControllersWindow.cpp b/Source/Core/DolphinQt2/Config/ControllersWindow.cpp
index e3269e8de1..7f8c98442e 100644
--- a/Source/Core/DolphinQt2/Config/ControllersWindow.cpp
+++ b/Source/Core/DolphinQt2/Config/ControllersWindow.cpp
@@ -297,6 +297,8 @@ void ControllersWindow::OnWiimoteTypeChanged(int type)
return;
}
}
+
+ SaveSettings();
}
void ControllersWindow::OnGCTypeChanged(int type)
@@ -312,6 +314,8 @@ void ControllersWindow::OnGCTypeChanged(int type)
return;
}
}
+
+ SaveSettings();
}
void ControllersWindow::OnBluetoothPassthroughResetPressed()
@@ -498,6 +502,9 @@ void ControllersWindow::SaveSettings()
const int index = m_wiimote_boxes[i]->currentIndex();
g_wiimote_sources[i] = index;
m_wiimote_buttons[i]->setEnabled(index != 0 && index != 2);
+
+ if (Core::IsRunning())
+ WiimoteReal::ChangeWiimoteSource(static_cast<u32>(i), index);
}
UICommon::SaveWiimoteSources();
@@ -507,7 +514,13 @@ void ControllersWindow::SaveSettings()
const int index = m_gc_controller_boxes[i]->currentIndex();
const std::optional<SerialInterface::SIDevices> si_device = FromGCMenuIndex(index);
if (si_device)
+ {
SConfig::GetInstance().m_SIDevice[i] = *si_device;
+
+ if (Core::IsRunning())
+ SerialInterface::ChangeDevice(*si_device, static_cast<s32>(i));
+ }
+
m_gc_buttons[i]->setEnabled(index != 0 && index != 6);
}
SConfig::GetInstance().SaveSettings();