Fixed loading state in Play screen (#33)

concerto-app · May 26, 2022 · 6a2fb6b · 6a2fb6b
1 parent 7d925ca
commit 6a2fb6b
Showing 1 changed file with 20 additions and 14 deletions.
diff --git a/src/screens/Play.tsx b/src/screens/Play.tsx
@@ -243,20 +243,24 @@ export default function Play({ navigation }: PlayProps) {
   useCancellable(
     (cancelInfo) => {
       if (!code) return;
-      room
-        .connect(
-          code,
-          handleRoomConnected,
-          handleUserConnected,
-          handleUserDisconnected,
-          handleRoomEvent
-        )
-        .then(() => {
-          if (!cancelInfo.cancelled) setRoomReady(true);
-        })
-        .catch(() => {
-          if (!cancelInfo.cancelled) setError("Can't connect to room.");
-        });
+      setRoomReady(false);
+      room.disconnect().then(() => {
+        if (cancelInfo.cancelled) return;
+        room
+          .connect(
+            code,
+            handleRoomConnected,
+            handleUserConnected,
+            handleUserDisconnected,
+            handleRoomEvent
+          )
+          .then(() => {
+            if (!cancelInfo.cancelled) setRoomReady(true);
+          })
+          .catch(() => {
+            if (!cancelInfo.cancelled) setError("Can't connect to room.");
+          });
+      });
       return () => {
         room.disconnect().then();
       };
@@ -297,6 +301,8 @@ export default function Play({ navigation }: PlayProps) {
     (cancelInfo) => {
       if (settings.instrument.value === undefined) return;
 
+      setPlayerReady(false);
+
       const load = async (instrument: string, notes: number[]) => {
         await player.player.unload();
         await player.player.load(instrument, notes);