Offer continuation from timeout

Author: g3force

internal/app/statemachine/change_continue.go

@@ -37,8 +37,8 @@ func (s *StateMachine) processChangeContinue(newState *state.State) (changes []*
 		return
 	}
 
-	if *newState.Command.Type == state.Command_HALT {
-		log.Printf("Continue with STOP after HALT")
+	if *newState.Command.Type == state.Command_HALT || *newState.Command.Type == state.Command_TIMEOUT {
+		log.Printf("Continue with STOP after %s", newState.Command.Type.String())
 		changes = append(changes, s.createCommandChange(state.NewCommandNeutral(state.Command_STOP)))
 	} else if newState.NextCommand != nil {
 		log.Printf("Continue with next command: %v", newState.NextCommand)

src/components/control/ControlFlowBar.vue

@@ -18,7 +18,7 @@
                       v-on:click="triggerContinue"
                       v-bind:disabled="continueDisabled">
                 Continue
-                <span v-if="nextCommand && nextCommand.forTeam">with</span>
+                <span v-if="nextCommand && nextCommand.type">with</span>
                 <span v-if="nextCommand"
                       :class="teamColorClass">
                     {{ nextCommand.type }}
@@ -68,6 +68,9 @@ export default {
         halted() {
             return this.$store.state.matchState.command.type === 'HALT';
         },
+        timeoutActive() {
+            return this.$store.state.matchState.command.type === 'TIMEOUT';
+        },
         continueDisabled() {
             return !this.nextCommand;
         },
@@ -82,6 +85,9 @@ export default {
                 }
                 return null;
             }
+            if (this.timeoutActive) {
+                return {type: 'STOP'}
+            }
             if (!this.$store.state.matchState.nextCommand) {
                 return null;
             }