Avoid infinite loop, still not a great fix but non-crashing Accumulator

heronarts · Aug 21, 2023 · d2d23e1 · d2d23e1
1 parent 2a26394
commit d2d23e1
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/main/java/heronarts/lx/modulator/Accumulator.java b/src/main/java/heronarts/lx/modulator/Accumulator.java
@@ -61,17 +61,21 @@ public Accumulator(String label, LXParameter velocity) {
 
   @Override
   protected double computeValue(double deltaMs) {
-    float currentValue = getValuef();
+    final float currentValue = getValuef();
     float amount = (float) (deltaMs * this.velocity.getValue());
+    if (amount == 0) {
+      return currentValue;
+    }
     float newValue = currentValue + this.sign * amount;
-    if (currentValue == newValue || Float.isInfinite(newValue)) {
+    if ((currentValue == newValue) || Float.isInfinite(newValue)) {
       if (++this.collisions > 3) {
         this.collisions = 0;
         this.sign = -this.sign;
+        int i = 0;
         do {
           newValue = currentValue + this.sign * amount;
           amount *= 10;
-        } while (newValue == currentValue);
+        } while ((newValue == currentValue) && (i++ < 10));
       }
     }
     return newValue;