From ac486ce00f7df67ea8e297019b8b81abd8219704 Mon Sep 17 00:00:00 2001
From: Manuel Martin <manmartin@mozilla.com>
Date: Fri, 23 Jun 2023 16:45:45 +0200
Subject: [PATCH] Avoid unnecessary eid access

---
 src/scene-entry-manager.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/scene-entry-manager.js b/src/scene-entry-manager.js
index fb171d3715..6dda8ce82b 100644
--- a/src/scene-entry-manager.js
+++ b/src/scene-entry-manager.js
@@ -256,7 +256,7 @@ export default class SceneEntryManager {
           spawnFromFileList([src]);
         }
       } else {
-        spawnMediaInfrontOfPlayerAndReturn(src, contentOrigin).eid;
+        spawnMediaInfrontOfPlayerAndReturn(src, contentOrigin);
       }
     };
 
@@ -365,10 +365,12 @@ export default class SceneEntryManager {
         } else {
           currentVideoShareEntity = spawnMediaInfrontOfPlayerAndReturn(this.mediaDevicesManager.mediaStream, undefined);
           // Wire up custom removal event which will stop the stream.
-          currentVideoShareEntity.setAttribute(
-            "emit-scene-event-on-remove",
-            `event:${MediaDevicesEvents.VIDEO_SHARE_ENDED}`
-          );
+          if (currentVideoShareEntity) {
+            currentVideoShareEntity.setAttribute(
+              "emit-scene-event-on-remove",
+              `event:${MediaDevicesEvents.VIDEO_SHARE_ENDED}`
+            );
+          }
         }
 
         this.scene.emit("share_video_enabled", { source: isDisplayMedia ? MediaDevices.SCREEN : MediaDevices.CAMERA });