From 611a01bc0f5b74af4c94ed8a7bf7e5b816e035bd Mon Sep 17 00:00:00 2001
From: Eoin Motherway <25342760+YuKitsune@users.noreply.github.com>
Date: Tue, 9 Jun 2026 17:02:19 +1000
Subject: [PATCH] fix: keep hold window open when aircraft overflies hold point

vatSys advances OverflownIndex past the hold point when the aircraft enters the hold, causing the window to close. Now checks if the hold point is the most recently overflown waypoint before treating the hold as cancelled.

Fixes #11
---
 source/HoldPlugin/Plugin.cs | 42 +++++++++++++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/source/HoldPlugin/Plugin.cs b/source/HoldPlugin/Plugin.cs
index 945152e..c95d264 100644
--- a/source/HoldPlugin/Plugin.cs
+++ b/source/HoldPlugin/Plugin.cs
@@ -339,21 +339,39 @@ bool TryParseHoldPointFromLabelOpData(FDP2.FDR fdr, out string holdPointName, ou
             }
 
             // Try matching to a point on the route
-            
+
             var waypoints = fdr.ParsedRoute
                 .Skip(fdr.ParsedRoute.OverflownIndex)
                 .Where(s => s.Type == FDP2.FDR.ExtractedRoute.Segment.SegmentTypes.WAYPOINT)
                 .ToArray();
-            
+
             // Search for exact matches first
             var matchingSegment = waypoints.FirstOrDefault(s => s.Intersection.Name == partialPointName);
-            
+
             // No exact match, check for matches against the first 3 chars
             if (matchingSegment is null && partialPointName.Length >= 3)
             {
                 matchingSegment = waypoints.FirstOrDefault(s => s.Intersection.Name.StartsWith(partialPointName));
             }
-            
+
+            // The hold point may be the most recently overflown waypoint when the aircraft has just
+            // entered the hold. Check for this before concluding the hold text is invalid.
+            if (matchingSegment is null && fdr.ParsedRoute.OverflownIndex > 0)
+            {
+                var lastOverflownIdx = fdr.ParsedRoute
+                    .GetRange(0, fdr.ParsedRoute.OverflownIndex + 1)
+                    .FindLastIndex(s => s.Type == FDP2.FDR.ExtractedRoute.Segment.SegmentTypes.WAYPOINT);
+                if (lastOverflownIdx >= 0)
+                {
+                    var lastOverflown = fdr.ParsedRoute[lastOverflownIdx];
+                    if (lastOverflown.Intersection.Name == partialPointName ||
+                        (partialPointName.Length >= 3 && lastOverflown.Intersection.Name.StartsWith(partialPointName)))
+                    {
+                        matchingSegment = lastOverflown;
+                    }
+                }
+            }
+
             if (matchingSegment is null)
             {
                 continue;
@@ -378,6 +396,22 @@ bool TryFindHoldSegments(
         holdSegment = fdr.ParsedRoute
             .Skip(fdr.ParsedRoute.OverflownIndex)
             .FirstOrDefault(s => s.Type == FDP2.FDR.ExtractedRoute.Segment.SegmentTypes.WAYPOINT && s.Intersection.Name == holdItem.HoldPoint);
+
+        // The hold point may be the most recently overflown waypoint when the aircraft has just
+        // entered the hold.
+        if (holdSegment is null && fdr.ParsedRoute.OverflownIndex > 0)
+        {
+            var lastOverflownIdx = fdr.ParsedRoute
+                .GetRange(0, fdr.ParsedRoute.OverflownIndex + 1)
+                .FindLastIndex(s => s.Type == FDP2.FDR.ExtractedRoute.Segment.SegmentTypes.WAYPOINT);
+            if (lastOverflownIdx >= 0)
+            {
+                var candidate = fdr.ParsedRoute[lastOverflownIdx];
+                if (candidate.Intersection.Name == holdItem.HoldPoint)
+                    holdSegment = candidate;
+            }
+        }
+
         if (holdSegment is null)
             return false;