From 068eda48adc0503219bf8b6f167717d442e6899e Mon Sep 17 00:00:00 2001
From: afischerdev <afischer@dbserv.de>
Date: Tue, 14 Jan 2025 11:38:45 +0100
Subject: [PATCH] protect against start way logic

---
 .../src/main/java/btools/router/RoutingContext.java        | 7 ++++++-
 .../src/main/java/btools/router/RoutingEngine.java         | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/brouter-core/src/main/java/btools/router/RoutingContext.java b/brouter-core/src/main/java/btools/router/RoutingContext.java
index 0d6d3b5..2559f3a 100644
--- a/brouter-core/src/main/java/btools/router/RoutingContext.java
+++ b/brouter-core/src/main/java/btools/router/RoutingContext.java
@@ -172,10 +172,15 @@ public final class RoutingContext {
     useDynamicDistance = expctxGlobal.getVariableValue("use_dynamic_range", 0f) == 1f;
 
     boolean test = expctxGlobal.getVariableValue("check_start_way", 1f) == 1f;
-    if (!test) expctxGlobal.freeNoWays();
+    if (!test) freeNoWays();
 
   }
 
+  public void freeNoWays() {
+    BExpressionContext expctxGlobal = expctxWay;
+    if (expctxGlobal != null) expctxGlobal.freeNoWays();
+  }
+
   public List<OsmNodeNamed> poipoints;
 
   public List<OsmNodeNamed> nogopoints = null;
diff --git a/brouter-core/src/main/java/btools/router/RoutingEngine.java b/brouter-core/src/main/java/btools/router/RoutingEngine.java
index 0cd4a18..14fa36f 100644
--- a/brouter-core/src/main/java/btools/router/RoutingEngine.java
+++ b/brouter-core/src/main/java/btools/router/RoutingEngine.java
@@ -327,6 +327,8 @@ public class RoutingEngine extends Thread {
     try {
       startTime = System.currentTimeMillis();
 
+      routingContext.freeNoWays();
+
       MatchedWaypoint wpt1 = new MatchedWaypoint();
       wpt1.waypoint = waypoints.get(0);
       wpt1.name = "wpt_info";