diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2017-06-05 19:05:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-05 19:05:09 -0700 |
| commit | b9b3b1dc19970664d81be953f7a856fa5ca739e4 (patch) | |
| tree | 66397af55ede9ec4b079829f528514ab05c7a21d /Source/Core/InputCommon/ControllerEmu/Control/Control.cpp | |
| parent | bc8024ed2114dca934907666ff999a60bbca267f (diff) | |
| parent | 0146456af0d907783d60a61ca75e6abb2fc2bab5 (diff) | |
Merge pull request #5347 from JosJuice/do-not-translate-button-names
Don't translate button names
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/Control/Control.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/Control/Control.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Control.cpp b/Source/Core/InputCommon/ControllerEmu/Control/Control.cpp index 56c4cba12d..3f5d00d822 100644 --- a/Source/Core/InputCommon/ControllerEmu/Control/Control.cpp +++ b/Source/Core/InputCommon/ControllerEmu/Control/Control.cpp @@ -9,8 +9,14 @@ namespace ControllerEmu { +Control::Control(std::unique_ptr<ControlReference> ref, const std::string& name_, + const std::string& ui_name_) + : control_ref(std::move(ref)), name(name_), ui_name(ui_name_) +{ +} + Control::Control(std::unique_ptr<ControlReference> ref, const std::string& name_) - : control_ref(std::move(ref)), name(name_) + : Control(std::move(ref), name_, name_) { } |