Merge pull request #804 from mozilla/bug/sentry-errors

Fix adapter and fileId errors
Hubs-Foundation · Dec 31, 2018 · a13825d · a13825d
2 parents cdff252 + edfd080
commit a13825d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/src/components/freeze-controller.js b/src/components/freeze-controller.js
@@ -36,6 +36,7 @@ AFRAME.registerComponent("freeze-controller", {
 
   onToggle: function() {
     window.APP.store.update({ activity: { hasFoundFreeze: true } });
+    if (!NAF.connection.adapter) return;
     NAF.connection.adapter.toggleFreeze();
     if (NAF.connection.adapter.frozen) {
       this.el.emit("play_freeze_sound");

diff --git a/src/components/mute-mic.js b/src/components/mute-mic.js
@@ -50,6 +50,7 @@ AFRAME.registerComponent("mute-mic", {
   },
 
   onToggle: function() {
+    if (!NAF.connection.adapter) return;
     if (this.el.is("muted")) {
       NAF.connection.adapter.enableMicrophone(true);
       this.el.removeState("muted");
@@ -60,6 +61,7 @@ AFRAME.registerComponent("mute-mic", {
   },
 
   onMute: function() {
+    if (!NAF.connection.adapter) return;
     if (!this.el.is("muted")) {
       NAF.connection.adapter.enableMicrophone(false);
       this.el.addState("muted");

diff --git a/src/scene-entry-manager.js b/src/scene-entry-manager.js
@@ -257,7 +257,8 @@ export default class SceneEntryManager {
       const networkId = components.networked.data.networkId;
       el.setAttribute("networked", { persistent: false });
 
-      const { fileId } = el.components["media-loader"].data;
+      const mediaLoader = components["media-loader"];
+      const fileId = mediaLoader.data && mediaLoader.data.fileId;
 
       this.hubChannel.unpin(networkId, fileId);
     });