Merge pull request #725 from bigredfrog/audio_deactivate

fix: protect against concurrent deactivate of audio
LedFx · Feb 11, 2024 · c493dae · c493dae
2 parents 91f4aba + c56fbb5
commit c493dae
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/ledfx/effects/audio.py b/ledfx/effects/audio.py
@@ -133,6 +133,7 @@ def AUDIO_CONFIG_SCHEMA():
 
     def __init__(self, ledfx, config):
         self._ledfx = ledfx
+        self.lock = threading.Lock()
         self.update_config(config)
 
         def shutdown_event(e):
@@ -313,11 +314,12 @@ def open_audio_stream(device_idx):
             open_audio_stream(default_device)
 
     def deactivate(self):
-        if self._stream:
-            self._stream.stop()
-            self._stream.close()
-            self._stream = None
-        self._is_activated = False
+        with self.lock:
+            if self._stream:
+                self._stream.stop()
+                self._stream.close()
+                self._stream = None
+            self._is_activated = False
         _LOGGER.info("Audio source closed.")
 
     def subscribe(self, callback):