# HG changeset patch
# User rubidium <rubidium@openttd.org>
# Date 2010-12-26 12:55:12
# Node ID ecc17e887eaf0cf19e65df3fdb71ccd9fa97a342
# Parent  d3b3d1abd708a3dcdb888ef623dbc3c6016d1233

(svn r21643) -Fix (r21642): crash when a train with no orders (or actually no order list) stops at a station

diff --git a/src/vehicle.cpp b/src/vehicle.cpp
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -1764,7 +1764,7 @@ void Vehicle::BeginLoading()
 		/* We weren't scheduled to stop here. Insert an automatic order
 		 * to show that we are stopping here. */
 		Order *in_list = this->GetOrder(this->cur_order_index);
-		if (this->orders.list->GetNumOrders() < MAX_VEH_ORDER_ID &&
+		if ((this->orders.list == NULL || this->orders.list->GetNumOrders() < MAX_VEH_ORDER_ID) &&
 				((in_list == NULL && this->cur_order_index == 0) ||
 				(in_list != NULL && (!in_list->IsType(OT_AUTOMATIC) ||
 				in_list->GetDestination() != this->last_station_visited)))) {