1 files changed, 12 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControlReference/FunctionExpression.cpp b/Source/Core/InputCommon/ControlReference/FunctionExpression.cpp
index 15a66ec9d1..84f3ac907e 100644
--- a/Source/Core/InputCommon/ControlReference/FunctionExpression.cpp
+++ b/Source/Core/InputCommon/ControlReference/FunctionExpression.cpp
@@ -32,7 +32,8 @@ class ToggleExpression : public FunctionExpression
 private:
   virtual bool ValidateArguments(const std::vector<std::unique_ptr<Expression>>& args) override
   {
-    return 1 == args.size();
+    // Optional 2nd argument for clearing state:
+    return 1 == args.size() || 2 == args.size();
   }
 
   ControlState GetValue() const override
@@ -49,6 +50,11 @@ private:
       m_state ^= true;
     }
 
+    if (2 == GetArgCount() && GetArg(1).GetValue() > CONDITION_THRESHOLD)
+    {
+      m_state = false;
+    }
+
     return m_state;
   }
 
@@ -257,5 +263,10 @@ const Expression& FunctionExpression::GetArg(u32 number) const
   return *m_args[number];
 }
 
+u32 FunctionExpression::GetArgCount() const
+{
+  return u32(m_args.size());
+}
+
 }  // namespace ExpressionParser
 }  // namespace ciface