(svn r26101) -Fix: NULL pointer dereference when one can't allocate an order list but wants to make implicit orders

1 files changed, 1 insertions, 2 deletions

diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index 6a25d080b..2037da7cd 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -2012,8 +2012,7 @@ void Vehicle::BeginLoading()
 						}
 					}
 				} else if (!suppress_implicit_orders &&
-						((this->orders.list == NULL && OrderList::CanAllocateItem()) ||
-						this->orders.list->GetNumOrders() < MAX_VEH_ORDER_ID) &&
+						((this->orders.list == NULL ? OrderList::CanAllocateItem() : this->orders.list->GetNumOrders() < MAX_VEH_ORDER_ID)) &&
 						Order::CanAllocateItem()) {
 					/* Insert new implicit order */
 					Order *implicit_order = new Order();