From 9b5d71b180f87e356c1581c400c393859862204e Mon Sep 17 00:00:00 2001 From: masterdraco Date: Tue, 29 Sep 2026 17:59:11 +0200 Subject: [PATCH] =?UTF-8?q?fix(flows):=20flow=20der=20ikke=20er=20stoppet?= =?UTF-8?q?=20og=20har=20k=C3=B8rende=20traktorer=20t=C3=A6ller=20som=20k?= =?UTF-8?q?=C3=B8rende=20efter=20genindl=C3=A6sning=20=E2=80=94=20listen?= =?UTF-8?q?=20viste=20[Start]=20ved=20k=C3=B8rende=20flows=20(v1.59.2.0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FS25_ADSmartPickup/adRunsController.lua | 4 +++- FS25_ADSmartPickup/modDesc.xml | 2 +- tests/test_adRunsController.lua | 7 +++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/FS25_ADSmartPickup/adRunsController.lua b/FS25_ADSmartPickup/adRunsController.lua index 53581f3..d5ba6bc 100644 --- a/FS25_ADSmartPickup/adRunsController.lua +++ b/FS25_ADSmartPickup/adRunsController.lua @@ -1293,7 +1293,9 @@ function ADRunsController.getRunStatus(adEnv, run) running = running + 1 end end - local isRunning = ADRunsController.runningRuns[run.id] == true and running > 0 + -- startet fra fanen i denne session ELLER ikke stoppet af spilleren (efter genindlæsning er runningRuns tom, + -- men traktorerne kører videre — in-game 29/9: listen viste [Start] ved kørende flows) + local isRunning = (ADRunsController.runningRuns[run.id] == true or run.stopped == false) and running > 0 if ADRunsController.runningRuns[run.id] and running == 0 then ADRunsController.runningRuns[run.id] = nil end diff --git a/FS25_ADSmartPickup/modDesc.xml b/FS25_ADSmartPickup/modDesc.xml index 757fed4..54846aa 100644 --- a/FS25_ADSmartPickup/modDesc.xml +++ b/FS25_ADSmartPickup/modDesc.xml @@ -1,7 +1,7 @@ masterdraco - 1.59.1.0 + 1.59.2.0 <en>AD Smart Pickup</en> diff --git a/tests/test_adRunsController.lua b/tests/test_adRunsController.lua index 3164f7b..aa4deef 100644 --- a/tests/test_adRunsController.lua +++ b/tests/test_adRunsController.lua @@ -238,6 +238,13 @@ check("C7 stop rydder markeringen", ADRunsController.getRunStatus(adEnv, ADRuns. -- en traktor der kører AD uden at run'et er startet af os, gør IKKE run'et "kørende" fastracA.ad.stateModule.active = true check("C7 manuel AD tæller ikke som kørende run", ADRunsController.getRunStatus(adEnv, ADRuns.getRun(ADRunsController.store, cow.id)).isRunning, false) +-- efter genindlæsning: runningRuns er tom, men flowet er ikke stoppet og traktoren kører -> kørende (Stop-knap) +-- (in-game 29/9: Flows-listen viste [Start] ved flows der kørte) +ADRuns.getRun(ADRunsController.store, cow.id).stopped = false +ADRunsController.runningRuns[cow.id] = nil +check("C7b efter genindlæsning: kørende", ADRunsController.getRunStatus(adEnv, ADRuns.getRun(ADRunsController.store, cow.id)).isRunning, true) +check("C7b efter genindlæsning: kan stoppes", ADRunsController.getRunStatus(adEnv, ADRuns.getRun(ADRunsController.store, cow.id)).canStop, true) +ADRuns.getRun(ADRunsController.store, cow.id).stopped = true check("C7 men aktive tæller stadig", ADRunsController.getRunStatus(adEnv, ADRuns.getRun(ADRunsController.store, cow.id)).running, 1) fastracA.ad.stateModule.active = false -- sprungne traktorer logges med årsag