Merge pull request #1042 from Mind-Sports-Games/pla-1144-investigate-…

…redirect-of-game-in-swiss-back-to-lobby-on-match Pla 1144 investigate redirect of game in swiss back to lobby on match
Mind-Sports-Games · Feb 6, 2025 · 329746e · 329746e
2 parents ff366d9 + c508133
commit 329746e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ui/draughtsround/src/view/button.ts b/ui/draughtsround/src/view/button.ts
@@ -306,7 +306,7 @@ export function backToTournament(ctrl: RoundController): VNode | undefined {
 
 export function backToSwiss(ctrl: RoundController): VNode | undefined {
   const d = ctrl.data;
-  const moreGamesInMultiMatch = d.game.multiMatch.index < ctrl.data.swiss?.nbGamesPerRound;
+  const moreGamesInMultiMatch = d.game.multiMatch && d.game.multiMatch.index < ctrl.data.swiss?.nbGamesPerRound;
   if (d.swiss?.running && moreGamesInMultiMatch) {
     ctrl.setRedirecting();
     setTimeout(() => {

diff --git a/ui/round/src/view/button.ts b/ui/round/src/view/button.ts
@@ -444,7 +444,7 @@ export function backToTournament(ctrl: RoundController): VNode | undefined {
 export function backToSwiss(ctrl: RoundController): VNode | undefined {
   const d = ctrl.data;
   const mps = ctrl.finalMultiPointState();
-  const moreGamesInMultiMatch = d.game.multiMatch.index < ctrl.data.swiss?.nbGamesPerRound;
+  const moreGamesInMultiMatch = d.game.multiMatch && d.game.multiMatch.index < ctrl.data.swiss?.nbGamesPerRound;
   const moreGamesInMultiPoint = mps && mps.p1 < mps.target && mps.p2 < mps.target;
   if (d.swiss?.running && (moreGamesInMultiMatch || moreGamesInMultiPoint)) {
     ctrl.setRedirecting();