Merge pull request #6217 from mozilla/AudioDisconnectGuard

bitECS: Prevent Three.js Audio.disconnect error
Hubs-Foundation · Aug 16, 2023 · 0a89bdd · 0a89bdd
2 parents 7946c36 + e9c5702
commit 0a89bdd
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/bit-systems/audio-emitter-system.ts b/src/bit-systems/audio-emitter-system.ts
@@ -19,7 +19,9 @@ export function isPositionalAudio(node: AudioObject3D): node is PositionalAudio
 
 export function cleanupAudio(audio: AudioObject3D) {
   const eid = audio.eid!;
-  audio.disconnect();
+  if (audio.source !== null) {
+    audio.disconnect();
+  }
   const audioSystem = APP.scene?.systems["hubs-systems"].audioSystem;
   APP.audios.delete(eid);
   APP.supplementaryAttenuation.delete(eid);
@@ -34,7 +36,9 @@ function swapAudioType<T extends AudioObject3D>(
   NewType: AudioConstructor<T>
 ) {
   const audio = world.eid2obj.get(eid)! as AudioObject3D;
-  audio.disconnect();
+  if (audio.source !== null) {
+    audio.disconnect();
+  }
   APP.sourceType.set(eid, SourceType.MEDIA_VIDEO);
   APP.supplementaryAttenuation.delete(eid);
   APP.audios.delete(eid);