From 972ecc41064b7af07244ccc099fac73aca50bf00 Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Mon, 7 Dec 2020 15:44:59 +0900
Subject: [PATCH] Merge pull request #2183 from
 dmitrylyzo/fix-multiserver-syncplay

SyncPlay, don't use bad ApiClient

(cherry picked from commit 9815c64cdcdc00c2edcdc02e378cfc6c68888ddd)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
---
 src/scripts/site.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/scripts/site.js b/src/scripts/site.js
index 04f19c9d0b..543486fae4 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -169,8 +169,11 @@ function initSyncPlay() {
 
     // Start SyncPlay.
     const apiClient = ServerConnections.currentApiClient();
-    SyncPlay.Manager.init(apiClient);
+    if (apiClient) SyncPlay.Manager.init(apiClient);
     SyncPlayToasts.init();
+
+    // FIXME: Multiple apiClients?
+    Events.on(ServerConnections, 'apiclientcreated', (e, newApiClient) => SyncPlay.Manager.init(newApiClient));
 }
 
 function onAppReady() {