Config for disabling runner live population

Author: TheApplePieGod

client/src/client-config.tsx

@@ -36,6 +36,7 @@ const DEFAULT_CONFIG = {
     focusRobotTurn: true,
     enableFancyPaint: true,
     streamRunnerGames: true,
+    populateRunnerGames: true,
     profileGames: false,
     validateMaps: false,
     resolutionScale: 100,
@@ -68,6 +69,7 @@ const configDescription: Record<keyof ClientConfig, string> = {
     focusRobotTurn: 'Focus the robot when performing their turn during turn-stepping mode',
     enableFancyPaint: 'Enable fancy paint rendering',
     streamRunnerGames: 'Stream each round from the runner live as the game is being played',
+    populateRunnerGames: 'Display the finished game immediately when the runner is finished running',
     profileGames: 'Enable saving profiling data when running games',
     validateMaps: 'Validate maps before running a game',
     resolutionScale: 'Resolution scale for the game area. Decrease to help performance.',

client/src/components/sidebar/runner/scaffold.ts

@@ -202,11 +202,16 @@ export const useScaffold = (): Scaffold => {
         }
 
         const onGameComplete = (game: Game) => {
-            appContext.setState((prevState) => ({
-                ...prevState,
-                queue: prevState.queue.find((g) => g == game) ? prevState.queue : prevState.queue.concat([game])
-            }))
-            if (game.matches.length > 0) GameRunner.setMatch(game.matches[0])
+            appContext.setState((prevState) => {
+                if (prevState.config.populateRunnerGames && game.matches.length > 0) {
+                    GameRunner.setMatch(game.matches[0])
+                }
+
+                return {
+                    ...prevState,
+                    queue: prevState.queue.find((g) => g == game) ? prevState.queue : prevState.queue.concat([game])
+                }
+            })
         }
 
         setWebSocketListener(

client/src/components/sidebar/runner/websocket.ts

@@ -62,7 +62,7 @@ export default class WebSocketListener {
         // Auto progress the round if the user hasn't done it themselves
         // We only want to do this if the currently selected match is the one being updated
         if (this.activeMatch && this.activeMatch === GameRunner.match) {
-            const newRound = this.activeMatch.maxRound - 1
+            const newRound = Math.max(this.activeMatch.maxRound - 2, 1)
             if (this.lastSetRound == this.activeMatch.currentRound.roundNumber) {
                 GameRunner.jumpToRound(newRound)
                 this.lastSetRound = newRound

client/src/playback/Match.ts

@@ -313,7 +313,7 @@ export default class Match {
         // Determine the maximum round we are allowed to jump to. If the game is
         // incomplete (still being updated with rounds), prevent jumping to the last
         // round to prevent issues (TODO: investigate why, but this seems to fix it)
-        const maxRound = this.maxRound - (this.game.complete ? 0 : 1)
+        const maxRound = this.maxRound - (this.game.complete ? 0 : 2)
 
         roundNumber = Math.max(1, Math.min(roundNumber, maxRound))
         if (roundNumber == this.currentRound.roundNumber) return