StephanRichter/Web4Rail
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

bugfixes

Browse Source
This commit is contained in:
Stephan Richter
2020-11-27 16:45:02 +01:00
parent dec68728ad
commit d89bd4a364
9 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/de/srsoftware/web4rail/moving/Train.java
View File

@@ -598,9 +598,13 @@ public class Train extends BaseClass implements Comparable<Train> {
}
public Object quitAutopilot() {
if (isSet(nextRoute)) {
nextRoute.reset();
nextRoute = null;
}
if (isSet(autopilot)) {
autopilot.stop = true;
autopilot = null;
autopilot = null;
return t("{} stopping at next block.",this);
} else return t("autopilot not active.");
}
@@ -615,7 +619,7 @@ public class Train extends BaseClass implements Comparable<Train> {
boolean error = !nextRoute.lockIgnoring(route);
error = error || !nextRoute.setTurnouts();
error = error || !route.fireSetupActions(context);
error = error || !nextRoute.fireSetupActions(context);
if (error) {
nextRoute.reset(); // may unlock tiles belonging to the current route.