mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r9430) [0.5] -Backport r9429: when deleting a vehicle which has shared orders with one more vehicle and no orders, segfaulted

release/0.5
truelight 2007-03-24 15:16:41 +00:00
parent be39b87154
commit c85022e3db
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
order_cmd.c
View File

@ -463,6 +463,8 @@ static void RemoveSharedOrderVehicleList(Vehicle *v)
{ {
WindowClass window_class; WindowClass window_class;
assert(v->orders != NULL);
switch (v->type) { switch (v->type) {
default: NOT_REACHED(); default: NOT_REACHED();
case VEH_Train: window_class = WC_TRAINS_LIST; break; case VEH_Train: window_class = WC_TRAINS_LIST; break;
@ -1161,7 +1163,7 @@ void DeleteVehicleOrders(Vehicle *v)
/* If we are the only one left in the Shared Order Vehicle List, /* If we are the only one left in the Shared Order Vehicle List,
* remove it, as we are no longer a Shared Order Vehicle */ * remove it, as we are no longer a Shared Order Vehicle */
if (u->prev_shared == NULL && u->next_shared == NULL) RemoveSharedOrderVehicleList(u); if (u->prev_shared == NULL && u->next_shared == NULL && u->orders != NULL) RemoveSharedOrderVehicleList(u);
/* We only need to update this-one, because if there is a third /* We only need to update this-one, because if there is a third
* vehicle which shares the same order-list, nothing will change. If * vehicle which shares the same order-list, nothing will change. If