From dd2cf931647fad0bee6a95f487a927a305bad3e9 Mon Sep 17 00:00:00 2001
From: Nusio_coding <136240793+Nusioos@users.noreply.github.com>
Date: Sat, 27 Dec 2025 20:00:57 +0100
Subject: [PATCH] Fix #14610: Do not treat aircraft with only depot orders as
 having valid orders (#14961)

---
 src/order_cmd.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp
index 2c6dafca8e..ae606468c2 100644
--- a/src/order_cmd.cpp
+++ b/src/order_cmd.cpp
@@ -1881,7 +1881,11 @@ uint16_t GetServiceIntervalClamped(int interval, bool ispercent)
  */
 static bool CheckForValidOrders(const Vehicle *v)
 {
-	return std::ranges::any_of(v->Orders(), [](const Order &order) { return order.IsGotoOrder(); });
+	/* Check if vehicle has any valid orders.
+	 * Function is only called for aircraft, no type check needed. */
+	return std::ranges::any_of(v->Orders(), [](const Order &order) {
+		return order.IsGotoOrder() && !order.IsType(OT_GOTO_DEPOT);
+	});
 }
 
 /**