summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorMatthew Parlane <parlane@gmail.com>2017-01-24 08:19:23 +1300
committerGitHub <noreply@github.com>2017-01-24 08:19:23 +1300
commit98311cd9f4c4a568d4e3790c2fba98714634dd30 (patch)
tree8200fee76806dd63a9ce4e03c3178becceb1633d /Source/Core
parentee065181d77924541a76e6401a9e752976e32100 (diff)
parenta9da2d9e20ce1655a860ac8d1fd548dce437efa6 (diff)
Merge pull request #4728 from lioncash/virtual-dtor
ControllerEmu: Add missing virtual destructor to BooleanSetting
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/InputCommon/ControllerEmu.cpp2
-rw-r--r--Source/Core/InputCommon/ControllerEmu.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu.cpp
index 4ea4b59637..678ae02259 100644
--- a/Source/Core/InputCommon/ControllerEmu.cpp
+++ b/Source/Core/InputCommon/ControllerEmu.cpp
@@ -103,6 +103,8 @@ void ControllerEmu::ControlGroup::LoadConfig(IniFile::Section* sec, const std::s
}
}
+ControllerEmu::ControlGroup::BooleanSetting::~BooleanSetting() = default;
+
void ControllerEmu::LoadConfig(IniFile::Section* sec, const std::string& base)
{
std::string defdev = default_device.ToString();
diff --git a/Source/Core/InputCommon/ControllerEmu.h b/Source/Core/InputCommon/ControllerEmu.h
index 147c8c109d..3dc028da15 100644
--- a/Source/Core/InputCommon/ControllerEmu.h
+++ b/Source/Core/InputCommon/ControllerEmu.h
@@ -107,6 +107,7 @@ public:
: m_type(setting_type), m_name(setting_name), m_default_value(default_value)
{
}
+ virtual ~BooleanSetting();
virtual bool GetValue() const { return m_value; }
virtual void SetValue(bool value) { m_value = value; }