--- a/roadveh_gui.c	Sun May 15 18:43:36 2005 +0000
+++ b/roadveh_gui.c	Sun May 15 18:50:55 2005 +0000
@@ -159,11 +159,11 @@
 		break;
 
 	case WE_ON_EDIT_TEXT: {
-		const char *b = e->edittext.str;
-		if (*b == 0)
-			return;
-		memcpy(_decode_parameters, b, 32);
-		DoCommandP(0, w->window_number, 0, NULL, CMD_NAME_VEHICLE | CMD_MSG(STR_902D_CAN_T_NAME_ROAD_VEHICLE));
+		if (e->edittext.str[0] != '\0') {
+			_cmd_text = e->edittext.str;
+			DoCommandP(0, w->window_number, 0, NULL,
+				CMD_NAME_VEHICLE | CMD_MSG(STR_902D_CAN_T_NAME_ROAD_VEHICLE));
+		}
 	} break;
 
 	}
@@ -441,11 +441,11 @@
 		break;
 
 	case WE_ON_EDIT_TEXT: {
-		const char *b = e->edittext.str;
-		if (*b == 0)
-			return;
-		memcpy(_decode_parameters, b, 32);
-		DoCommandP(0, WP(w,buildtrain_d).rename_engine, 0, NULL, CMD_RENAME_ENGINE | CMD_MSG(STR_9037_CAN_T_RENAME_ROAD_VEHICLE));
+		if (e->edittext.str[0] != '\0') {
+			_cmd_text = e->edittext.str;
+			DoCommandP(0, WP(w, buildtrain_d).rename_engine, 0, NULL,
+				CMD_RENAME_ENGINE | CMD_MSG(STR_9037_CAN_T_RENAME_ROAD_VEHICLE));
+		}
 	} break;
 
 	case WE_RESIZE: {