summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControlReference/ControlReference.cpp
diff options
context:
space:
mode:
authorJordan Woyak <jordan.woyak@gmail.com>2019-03-02 14:47:26 -0600
committerJordan Woyak <jordan.woyak@gmail.com>2019-10-11 18:12:18 -0500
commitca7ce674500b7664ed049ac1019a2e40636187dc (patch)
tree6cd8f5563ce9ee43a645ebbf43b13ee9eee6989f /Source/Core/InputCommon/ControlReference/ControlReference.cpp
parentc8b2188e1972f14aec24ac66908a641dbdbd106f (diff)
ExpressionParser/DolphinQt: Added parse results to UI.
Diffstat (limited to 'Source/Core/InputCommon/ControlReference/ControlReference.cpp')
-rw-r--r--Source/Core/InputCommon/ControlReference/ControlReference.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControlReference/ControlReference.cpp b/Source/Core/InputCommon/ControlReference/ControlReference.cpp
index c17cfb3c86..af7536547c 100644
--- a/Source/Core/InputCommon/ControlReference/ControlReference.cpp
+++ b/Source/Core/InputCommon/ControlReference/ControlReference.cpp
@@ -54,7 +54,9 @@ std::string ControlReference::GetExpression() const
void ControlReference::SetExpression(std::string expr)
{
m_expression = std::move(expr);
- std::tie(m_parse_status, m_parsed_expression) = ParseExpression(m_expression);
+ auto parse_result = ParseExpression(m_expression);
+ m_parse_status = parse_result.status;
+ m_parsed_expression = std::move(parse_result.expr);
}
ControlReference::ControlReference() : range(1), m_parsed_expression(nullptr)