Mercurial > hg > openttd

changeset 17195:42bf74a7086d draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r21934) -Fix (r21933): The original plan was to run the regression before committing.
author frosch <frosch@openttd.org>
date Mon, 31 Jan 2011 20:56:02 +0000
parents b590eca5d805
children b150d26f37a4
files src/order_cmd.cpp
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/order_cmd.cpp
+++ b/src/order_cmd.cpp
@@ -1860,7 +1860,7 @@
 
 	/* Get the current order */
 	order = v->GetOrder(v->cur_real_order_index);
-	if (order->IsType(OT_AUTOMATIC)) {
+	if (order != NULL && order->IsType(OT_AUTOMATIC)) {
 		assert(v->GetNumManualOrders() == 0);
 		order = NULL;
 	}
@@ -1927,7 +1927,7 @@
 	v->UpdateRealOrderIndex();
 
 	const Order *order = v->GetOrder(v->cur_real_order_index);
-	if (order->IsType(OT_AUTOMATIC)) {
+	if (order != NULL && order->IsType(OT_AUTOMATIC)) {
 		assert(v->GetNumManualOrders() == 0);
 		order = NULL;
 	}