Better erase in the lag handler. Oops (#182)

surge-synthesizer · Feb 20, 2025 · 6c8e7dd · 6c8e7dd
1 parent 9f4cfc8
commit 6c8e7dd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/include/sst/basic-blocks/dsp/LagCollection.h b/include/sst/basic-blocks/dsp/LagCollection.h
@@ -95,11 +95,17 @@ template <int N> struct LagCollection
 
     void processAll()
     {
-        for (auto &lag : activeSet)
+        for (auto it = activeSet.begin(); it != activeSet.end();)
         {
-            lag.process();
-            if (!lag.lag.isActive())
-                activeSet.removeFromActive(lag);
+            it->process();
+            if (!it->lag.isActive())
+            {
+                it = activeSet.erase(it);
+            }
+            else
+            {
+                ++it;
+            }
         }
     }
 

diff --git a/tests/dsp_tests.cpp b/tests/dsp_tests.cpp
@@ -1349,7 +1349,9 @@ TEST_CASE("Lag Collection", "[dsp]")
                 lags.setTarget(3, 0.7 + lv * 0.72, &vals[3]);
             }
             lags.processAll();
-            if (i < 14)
+            if (i == 0)
+                REQUIRE(lags.activeSet.activeCount == 0);
+            else if (i < 14 && i >= 1)
                 REQUIRE(lags.activeSet.activeCount == 1);
             else
                 REQUIRE(lags.activeSet.activeCount == 2);