summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorspycrab <spycrab@users.noreply.github.com>2018-05-13 21:17:46 +0200
committerspycrab <spycrab@users.noreply.github.com>2018-05-13 21:21:31 +0200
commit9e2f9db94c67332bc1af6d111d9fd2c68cb536d2 (patch)
treea019c4b968f7043ccae6204819e4c18ca49b7bf5 /Source/Core
parent7a5e51cda778932fbb03fa8db411dd8f75772b50 (diff)
Qt/Mapping: Fix mapping changes not being applied instantly
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DolphinQt2/Config/Mapping/MappingBool.cpp4
-rw-r--r--Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp1
-rw-r--r--Source/Core/DolphinQt2/Config/Mapping/MappingNumeric.cpp4
3 files changed, 9 insertions, 0 deletions
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingBool.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingBool.cpp
index 31529a8887..d1fc4f951d 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/MappingBool.cpp
+++ b/Source/Core/DolphinQt2/Config/Mapping/MappingBool.cpp
@@ -5,7 +5,10 @@
#include "DolphinQt2/Config/Mapping/MappingBool.h"
#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+
+#include "InputCommon/ControllerEmu/ControllerEmu.h"
#include "InputCommon/ControllerEmu/Setting/BooleanSetting.h"
+#include "InputCommon/ControllerInterface/ControllerInterface.h"
MappingBool::MappingBool(MappingWidget* widget, ControllerEmu::BooleanSetting* setting)
: QCheckBox(tr(setting->m_ui_name.c_str())), m_parent(widget), m_setting(setting)
@@ -19,6 +22,7 @@ void MappingBool::Connect()
connect(this, &QCheckBox::stateChanged, this, [this](int value) {
m_setting->SetValue(value);
m_parent->SaveSettings();
+ m_parent->GetController()->UpdateReferences(g_controller_interface);
});
}
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp
index 8224a39e2a..5e2aa189fa 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp
+++ b/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp
@@ -117,6 +117,7 @@ void MappingButton::Detect()
m_reference->SetExpression(expr.toStdString());
m_parent->SaveSettings();
Update();
+ m_parent->GetController()->UpdateReferences(g_controller_interface);
if (m_parent->IsIterativeInput())
m_parent->NextButton(this);
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingNumeric.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingNumeric.cpp
index c896c3d998..7073e8fffb 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/MappingNumeric.cpp
+++ b/Source/Core/DolphinQt2/Config/Mapping/MappingNumeric.cpp
@@ -5,7 +5,10 @@
#include "DolphinQt2/Config/Mapping/MappingNumeric.h"
#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+
+#include "InputCommon/ControllerEmu/ControllerEmu.h"
#include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
+#include "InputCommon/ControllerInterface/ControllerInterface.h"
MappingNumeric::MappingNumeric(MappingWidget* widget, ControllerEmu::NumericSetting* setting)
: m_parent(widget), m_setting(setting)
@@ -21,6 +24,7 @@ void MappingNumeric::Connect()
[this](int value) {
m_setting->SetValue(static_cast<double>(value) / 100);
m_parent->SaveSettings();
+ m_parent->GetController()->UpdateReferences(g_controller_interface);
});
}