--- a/src/order_cmd.cpp	Fri May 02 02:06:57 2008 +0000
+++ b/src/order_cmd.cpp	Fri May 02 08:15:36 2008 +0000
@@ -1781,6 +1781,7 @@
 {
 	bool is_dest_station = this->IsType(OT_GOTO_STATION) && this->dest == station;
 	return
+			(!this->IsType(OT_GOTO_DEPOT) || (this->GetDepotOrderType() & ODTFB_PART_OF_ORDERS) != 0) &&
 			v->last_station_visited != station && // Do stop only when we've not just been there
 			/* Finally do stop when there is no non-stop flag set for this type of station. */
 			!(this->GetNonStopType() & (is_dest_station ? ONSF_NO_STOP_AT_DESTINATION_STATION : ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS));