diff options
author | rubidium <rubidium@openttd.org> | 2013-06-04 15:04:59 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2013-06-04 15:04:59 +0000 |
commit | 254c3834d0ef508e167f1d3b3c000b1db04b578a (patch) | |
tree | 55f7a0f060d3d362b98d96e1c09cb0da23f84673 /src/roadveh_cmd.cpp | |
parent | 0d28dc92fc71c55fe0249937af5e98ebfadb2151 (diff) | |
download | openttd-254c3834d0ef508e167f1d3b3c000b1db04b578a.tar.xz |
(svn r25319) -Fix [FS#5570]: crash when train with reserved cargo vanishes
Diffstat (limited to 'src/roadveh_cmd.cpp')
-rw-r--r-- | src/roadveh_cmd.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp index 77b82a420..a204c391c 100644 --- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -460,9 +460,11 @@ inline int RoadVehicle::GetCurrentMaxSpeed() const */ static void DeleteLastRoadVeh(RoadVehicle *v) { + RoadVehicle *first = v->First(); Vehicle *u = v; for (; v->Next() != NULL; v = v->Next()) u = v; u->SetNext(NULL); + v->last_station_visited = first->last_station_visited; // for PreDestructor /* Only leave the road stop when we're really gone. */ if (IsInsideMM(v->state, RVSB_IN_ROAD_STOP, RVSB_IN_ROAD_STOP_END)) RoadStop::GetByTile(v->tile, GetRoadStopType(v->tile))->Leave(v); |