From 35e51ebbaa025bad87deb4668e0b32249dd62d77 Mon Sep 17 00:00:00 2001
From: Jordan Woyak <jordan.woyak@gmail.com>
Date: Sun, 30 Dec 2018 16:08:54 -0600
Subject: [PATCH] ExpressionParser: Clear expression variables on
 UpdateReferences call. I don't know if this is most sensible.

---
 Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp
index c5ff0705a2..2cf5edbb00 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp
@@ -40,6 +40,9 @@ void EmulatedController::UpdateReferences(const ControllerInterface& devi)
 {
   m_default_device_is_connected = devi.HasConnectedDevice(m_default_device);
 
+  // Reset variables:
+  m_expression_vars.clear();
+
   ciface::ExpressionParser::ControlEnvironment env(devi, GetDefaultDevice(), m_expression_vars);
 
   UpdateReferences(env);