summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorspycrab <spycrab@users.noreply.github.com>2018-05-02 16:55:42 +0200
committerspycrab <spycrab@users.noreply.github.com>2018-05-02 16:55:42 +0200
commit3d7b613be59bb8ecbd243dddffa8714ea23aae05 (patch)
tree67587349c86a5b1095908dd574a1dafd4fbb5b4e /Source/Core
parent71c8c65e6f3a5dd9064667c519205a7be9ee1560 (diff)
Qt/Mapping: Fix "Default" not working properly.
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp1
-rw-r--r--Source/Core/DolphinQt2/Config/Mapping/MappingWidget.h4
-rw-r--r--Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp1
-rw-r--r--Source/Core/DolphinQt2/Config/Mapping/MappingWindow.h1
4 files changed, 5 insertions, 2 deletions
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp
index 7ec19c7a04..ef3dddeaa1 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp
+++ b/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp
@@ -24,6 +24,7 @@ MappingWidget::MappingWidget(MappingWindow* window) : m_parent(window)
{
connect(window, &MappingWindow::ClearFields, this, &MappingWidget::OnClearFields);
connect(window, &MappingWindow::Update, this, &MappingWidget::Update);
+ connect(window, &MappingWindow::Save, this, &MappingWidget::SaveSettings);
}
MappingWindow* MappingWidget::GetParent() const
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.h b/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.h
index 5f6caff381..def4c46ed2 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.h
+++ b/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.h
@@ -24,7 +24,7 @@ namespace ControllerEmu
class Control;
class ControlGroup;
class EmulatedController;
-}
+} // namespace ControllerEmu
namespace ciface
{
@@ -32,7 +32,7 @@ namespace Core
{
class Device;
}
-}
+} // namespace ciface
class MappingWidget : public QWidget
{
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
index fbbcb59c17..218370dd67 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
+++ b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
@@ -345,6 +345,7 @@ void MappingWindow::OnDefaultFieldsPressed()
m_controller->LoadDefaults(g_controller_interface);
m_controller->UpdateReferences(g_controller_interface);
emit Update();
+ emit Save();
}
bool MappingWindow::IsIterativeInput() const
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.h b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.h
index 242087c014..27c36e1726 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.h
+++ b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.h
@@ -56,6 +56,7 @@ public:
signals:
void Update();
void ClearFields();
+ void Save();
private:
void SetMappingType(Type type);