Fix TOPLLab#23

MaartenS11 · Nov 22, 2021 · edfd5de · edfd5de
1 parent 4d9d799
commit edfd5de
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/primitives.cpp b/primitives.cpp
@@ -525,11 +525,14 @@ def_prim(subscribe_interrupt, threeToNoneU32) {
 def_prim(unsubscribe_interrupt, oneToNoneU32) {
     uint8_t pin = arg0.uint32;
 
-    handlers.erase(std::remove_if(handlers.begin(), handlers.end(),
-                                  [pin](Interrupt *handler) {
-                                      return handler->pin == pin;
-                                  }),
-                   handlers.end());
+    auto it = std::remove_if(
+        handlers.begin(), handlers.end(),
+        [pin](Interrupt *handler) { return handler->pin == pin; });
+
+    if (it != handlers.end()) {
+        handlers.erase(it, handlers.end());
+        detachInterrupt(digitalPinToInterrupt(pin));
+    }
 
     pop_args(1);
     return true;