Merge pull request #6972 from matrix-org/t3chguy/fix/19359

2021-10-19 08:15:54 +01:00
parent f8b6f13105 eeec9b16c0
commit 6ea32279a3
1 changed files with 4 additions and 1 deletions
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -275,8 +275,11 @@ const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }: ISp
            <AccessibleButton
                kind="primary"
                onClick={() => {
-                    setBusy(true);
                    onJoinButtonClicked();
+                    if (!cli.isGuest()) {
+                        // user will be shown a modal that won't fire a room join error
+                        setBusy(true);
+                    }
                }}
                disabled={!spacesEnabled || cannotJoin}
            >