From 5d746f8971024cfe8dc874d855a7b9737c62e4df Mon Sep 17 00:00:00 2001
From: Jonathan G Rennison <j.g.rennison@gmail.com>
Date: Sat, 1 Jul 2023 10:04:44 +0100
Subject: [PATCH] Don't use scheduled dispatch for predicted times in GUI when
 disabled

See: #559
---
 src/timetable_gui.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp
index 7f6a63ece4..4fdcfe6527 100644
--- a/src/timetable_gui.cpp
+++ b/src/timetable_gui.cpp
@@ -188,7 +188,7 @@ static void FillTimetableArrivalDepartureTable(const Vehicle *v, VehicleOrderID
 				if (no_offset) SetBit(table[i].flags, TADF_ARRIVAL_NO_OFFSET);
 			}
 
-			if (order->IsScheduledDispatchOrder(true) && !(i == start && !travelling)) {
+			if (HasBit(v->vehicle_flags, VF_SCHEDULED_DISPATCH) && order->IsScheduledDispatchOrder(true) && !(i == start && !travelling)) {
 				if (!no_offset) sum -= v->lateness_counter;
 				extern DateTicksScaled GetScheduledDispatchTime(const DispatchSchedule &ds, DateTicksScaled leave_time);
 				DispatchSchedule &ds = v->orders->GetDispatchScheduleByIndex(order->GetDispatchScheduleIndex());