From d2109c98fc01ef59788e58b033a1ba1c1bdfd99f Mon Sep 17 00:00:00 2001
From: Greg Fodor <gfodor@gmail.com>
Date: Sun, 30 Sep 2018 04:31:08 +0000
Subject: [PATCH] Fix prop type error on homepage
---
src/index.js | 2 +-
src/scene-entry-manager.js | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/index.js b/src/index.js
index fa64e8923..5c9f008cc 100644
--- a/src/index.js
+++ b/src/index.js
@@ -13,7 +13,7 @@ const sceneId = qs.get("scene_id") || (pathname.startsWith("/scenes/") && pathna
const root = (
<HomeRoot
initialEnvironment={qs.get("initial_environment")}
- sceneId={sceneId}
+ sceneId={sceneId || ""}
authVerify={qs.has("auth_topic")}
authTopic={qs.get("auth_topic")}
authToken={qs.get("auth_token")}
diff --git a/src/scene-entry-manager.js b/src/scene-entry-manager.js
index a2f67316e..b82fd1dee 100644
--- a/src/scene-entry-manager.js
+++ b/src/scene-entry-manager.js
@@ -57,6 +57,10 @@ export default class SceneEntryManager {
if (qsTruthy("offline")) return;
+ if (mediaStream) {
+ NAF.connection.adapter.setLocalMediaStream(mediaStream);
+ }
+
if (isBotMode) {
this.runBot(mediaStream);
return;
@@ -68,10 +72,6 @@ export default class SceneEntryManager {
this.store.update({ activity: { lastEnteredAt: new Date().toISOString() } });
});
- if (mediaStream) {
- NAF.connection.adapter.setLocalMediaStream(mediaStream);
- }
-
this.spawnAvatar();
};
--
GitLab