[feature] Always continue with stop after halt

Author: g3force

internal/app/controller/engine.go

@@ -282,12 +282,12 @@ func (e *Engine) Continue() {
 		e.State.TeamState[TeamBlue].BotSubstitutionIntend = false
 		e.State.TeamState[TeamYellow].BotSubstitutionIntend = false
 		e.SendCommand(CommandHalt, "")
-	} else if e.State.NextCommand != CommandUnknown {
-		log.Printf("Let game continue with next command")
-		e.SendCommand(e.State.NextCommand, e.State.NextCommandFor)
 	} else if e.State.Command == CommandHalt {
 		// continue with a stop after halt to let the robots prepare
 		e.SendCommand(CommandStop, "")
+	} else if e.State.NextCommand != CommandUnknown {
+		log.Printf("Let game continue with next command")
+		e.SendCommand(e.State.NextCommand, e.State.NextCommandFor)
 	} else {
 		if e.State.Command != CommandStop {
 			// halt the game, if not in STOP.

src/components/control/ControlFlowBar.vue

@@ -17,9 +17,9 @@
                       v-on:click="triggerContinue"
                       v-bind:disabled="!continuePossible">
                 Continue
-                <span v-if="state.nextCommand !== ''">with</span>
-                <span :class="{'team-blue': state.nextCommandFor === 'Blue', 'team-yellow': state.nextCommandFor === 'Yellow'}">
-                    {{state.nextCommand}}
+                <span v-if="nextCommand !== ''">with</span>
+                <span :class="{'team-blue': nextCommandFor === 'Blue', 'team-yellow': nextCommandFor === 'Yellow'}">
+                    {{nextCommand}}
                 </span>
             </b-button>
         </div>
@@ -51,7 +51,7 @@
             },
             keymapContinue() {
                 return {
-                    'ctrl+alt+space': () => {
+                    'ctrl+space': () => {
                         if (!this.$refs.btnContinue.disabled) {
                             this.triggerContinue()
                         }
@@ -65,12 +65,24 @@
                 return this.state.command === 'halt';
             },
             continuePossible() {
-                return this.halted || this.state.nextCommand !== '';
+                return this.nextCommand !== '';
             },
             stopAllowed() {
                 return isNonPausedStage(this.$store.state.refBoxState)
                     || isPreStage(this.$store.state.refBoxState);
             },
+            nextCommand() {
+                if (this.halted) {
+                    return 'stop'
+                }
+                return this.state.nextCommand;
+            },
+            nextCommandFor() {
+                if (this.halted) {
+                    return ''
+                }
+                return this.state.nextCommandFor;
+            }
         }
     }
 </script>