diff --git a/pom.xml b/pom.xml
index 519e71f..65b0123 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
de.srsoftware
web4rail
- 1.1.1
+ 1.1.2
Web4Rail
jar
Java Model Railway Control
diff --git a/resources/svg/SignalE.svg b/resources/svg/SignalE.svg
index 53e18c2..490188b 100644
--- a/resources/svg/SignalE.svg
+++ b/resources/svg/SignalE.svg
@@ -1,7 +1,7 @@
\ No newline at end of file
diff --git a/resources/svg/SignalN.svg b/resources/svg/SignalN.svg
index f9796ff..dc0c620 100644
--- a/resources/svg/SignalN.svg
+++ b/resources/svg/SignalN.svg
@@ -1,7 +1,7 @@
\ No newline at end of file
diff --git a/resources/svg/SignalS.svg b/resources/svg/SignalS.svg
index dc0c620..f9796ff 100644
--- a/resources/svg/SignalS.svg
+++ b/resources/svg/SignalS.svg
@@ -1,7 +1,7 @@
\ No newline at end of file
diff --git a/resources/svg/SignalW.svg b/resources/svg/SignalW.svg
index 490188b..53e18c2 100644
--- a/resources/svg/SignalW.svg
+++ b/resources/svg/SignalW.svg
@@ -1,7 +1,7 @@
\ No newline at end of file
diff --git a/resources/translations/Application.de.translation b/resources/translations/Application.de.translation
index 9c75ba7..49cdc32 100644
--- a/resources/translations/Application.de.translation
+++ b/resources/translations/Application.de.translation
@@ -68,6 +68,7 @@ Firing {} : starte {}
FinishRoute : Route abschließen
Found {} routes. : {} Routen gefunden.
FreeStartBlock : Start-Block freigeben
+Fullscreen : Vollbild
Hardware settings : Hardware-Einstellungen
Height : Höhe
Help : Hilfe
@@ -140,7 +141,7 @@ Set speed to {} {} : Geschwindigkeit auf {} {} setzen
Set {} to {} : {} auf {} setzen
SetPower : Strom schalten
Set speed to : Geschwindigkeit setzen
-Setup actions : Aktivierungs-Aktionen
+Setup actions : Vorbereitung-Aktionen
ShowText : Text anzeigen
Signals : Signale
Simulating movement of {}... : Simuliere Fahrt von {}...
diff --git a/src/main/java/de/srsoftware/web4rail/Plan.java b/src/main/java/de/srsoftware/web4rail/Plan.java
index 5681802..157f070 100644
--- a/src/main/java/de/srsoftware/web4rail/Plan.java
+++ b/src/main/java/de/srsoftware/web4rail/Plan.java
@@ -245,7 +245,7 @@ public class Plan extends BaseClass{
Vector routes = new Vector();
for (Block block : blocks) {
for (Connector con : block.startPoints()) {
- routes.addAll(follow(new Route().begin(block,con.from.inverse()),con));
+ routes.addAll(follow(new Route().begin(block,con.from),con));
}
}
for (Tile tile : tiles.values()) tile.routes().clear();
diff --git a/src/main/java/de/srsoftware/web4rail/Route.java b/src/main/java/de/srsoftware/web4rail/Route.java
index bf916b9..f56f39b 100644
--- a/src/main/java/de/srsoftware/web4rail/Route.java
+++ b/src/main/java/de/srsoftware/web4rail/Route.java
@@ -290,7 +290,7 @@ public class Route extends BaseClass implements Comparable{
path = new Vector();
turnouts = new HashMap<>();
startBlock = block;
- startDirection = from;
+ startDirection = from.inverse();
path.add(block);
return this;
}
diff --git a/src/main/java/de/srsoftware/web4rail/moving/Train.java b/src/main/java/de/srsoftware/web4rail/moving/Train.java
index 33d941e..176b6f4 100644
--- a/src/main/java/de/srsoftware/web4rail/moving/Train.java
+++ b/src/main/java/de/srsoftware/web4rail/moving/Train.java
@@ -598,9 +598,13 @@ public class Train extends BaseClass implements Comparable {
}
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 {
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.