uart_commands.c: no more text inception

src/uart/uart_commands.c

@@ -117,8 +117,12 @@ static void uartcmd_erase_eeprom(void) {
  * Displays a simple message without the need to prefix a scrolltext command.
  */
 static void uartcmd_simple_message(void) {
+	if (uartcmd_processing_allowed()) {
+		uartcmd_forbid();
 #ifdef JOYSTICK_SUPPORT
 		if (waitForFire) {
+#else
+		{
 #endif
 			g_rx_buffer[1] = '<';
 			g_rx_buffer[2] = '/';
@@ -128,10 +132,11 @@ static void uartcmd_simple_message(void) {
 			scrolltext(&g_rx_buffer[1]);
 #ifdef JOYSTICK_SUPPORT
 		} else {
+#endif
 			UART_PUTS_P(UART_STR_GAMETX_ERR);
 		}
-#endif
+		uartcmd_permit();
-
+	}
 }
 
 
@@ -139,17 +144,23 @@ static void uartcmd_simple_message(void) {
  * Displays a message which may use the complete range of scrolltext commands.
  */
 static void uartcmd_scroll_message(void) {
+	if (uartcmd_processing_allowed()) {
+		uartcmd_forbid();
 #ifdef JOYSTICK_SUPPORT
 		if (waitForFire) {
+#else
+		{
 #endif
 			// text must not be longer than the scroll text buffer
 			g_rx_buffer[7 + SCROLLTEXT_BUFFER_SIZE - 1] = 0;
 			scrolltext(&g_rx_buffer[7]);
 #ifdef JOYSTICK_SUPPORT
 		} else {
+#endif
 			UART_PUTS_P(UART_STR_GAMETX_ERR);
 		}
-#endif
+		uartcmd_permit();
+	}
 }