Merge pull request #6842 from spycrab/qt_map_apply

Qt/Mapping: Fix mapping changes not being applied instantly
dolphin-emu · May 13, 2018 · 345838d · 345838d
2 parents c7a0b6c + 9e2f9db
commit 345838d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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);
           });
 }