Prevented expressions getting stuck when expression detection is disa…

…bled or tracking is lost in `OpenSeeVRMDriver`.
emilianavt · Aug 15, 2020 · 8f65c02 · 8f65c02
1 parent 9ce7d39
commit 8f65c02
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Examples/OpenSeeVRMDriver.cs b/Examples/OpenSeeVRMDriver.cs
@@ -846,13 +846,13 @@ void UpdateExpression() {
             toggledExpression.triggered = false;
 
         if (!overridden && !trigger) {
-            if (openSeeExpression.expression == null || openSeeExpression.expression == "" || !expressionMap.ContainsKey(openSeeExpression.expression)) {
+            if (!openSeeExpression.enabled || openSeeExpression.expressionTime + 15f < Time.time || openSeeExpression.expression == null || openSeeExpression.expression == "" || !expressionMap.ContainsKey(openSeeExpression.expression)) {
                 currentExpression = null;
             } else {
                 currentExpression = expressionMap[openSeeExpression.expression];
                 currentExpression.triggered = true;
             }
-        } else if (openSeeExpression.expression != null && openSeeExpression.expression != "" && expressionMap.ContainsKey(openSeeExpression.expression)) {
+        } else if (openSeeExpression.enabled && openSeeExpression.expressionTime + 15f > Time.time && openSeeExpression.expression != null && openSeeExpression.expression != "" && expressionMap.ContainsKey(openSeeExpression.expression)) {
             if (expressionMap[openSeeExpression.expression].additive)
                 expressionMap[openSeeExpression.expression].triggered = true;
         }