Merge branch 'template_train_replacement-sx' into jgrpp

2016-06-10 00:06:16 +01:00
parent 3b42e299aa ed20e1c61a
commit e95a24a4e9
4 changed files with 9 additions and 16 deletions
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -4864,6 +4864,9 @@ CommandCost CmdTemplateReplaceVehicle(TileIndex tile, DoCommandFlag flags, uint3
 	Train *remainder_chain = NULL;
 	Train *tmp_chain = NULL;
 	TemplateVehicle *tv = GetTemplateVehicleByGroupID(incoming->group_id);
+	if (tv == NULL) {
+		return CMD_ERROR;
+	}
 	EngineID eid = tv->engine_type;

 	CommandCost buy(EXPENSES_NEW_VEHICLES);