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

bugfix

Browse Source
This commit is contained in:
Stephan Richter
2021-01-09 21:47:51 +01:00
parent 4213cc207f
commit 887d557d5e
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>de.srsoftware</groupId> <groupId>de.srsoftware</groupId>
<artifactId>web4rail</artifactId> <artifactId>web4rail</artifactId>
<version>1.3.10</version> <version>1.3.11</version>
<name>Web4Rail</name> <name>Web4Rail</name>
<packaging>jar</packaging> <packaging>jar</packaging>
<description>Java Model Railway Control</description> <description>Java Model Railway Control</description>

18
src/main/java/de/srsoftware/web4rail/conditions/RouteEndBlock.java
View File

@@ -5,6 +5,7 @@ import java.util.List;
import org.json.JSONObject; import org.json.JSONObject;
import de.srsoftware.web4rail.Application;
import de.srsoftware.web4rail.BaseClass; import de.srsoftware.web4rail.BaseClass;
import de.srsoftware.web4rail.Route; import de.srsoftware.web4rail.Route;
import de.srsoftware.web4rail.Window; import de.srsoftware.web4rail.Window;
@@ -36,7 +37,22 @@ public class RouteEndBlock extends Condition{
public Condition load(JSONObject json) { public Condition load(JSONObject json) {
super.load(json); super.load(json);
block(Block.get(new Id(json.getString(BLOCK)))); Id bid = new Id(json.getString(BLOCK));
Block block = BaseClass.get(bid);
if (isSet(block)) {
block(block);
} else {
Application.threadPool.execute(new Thread() {
@Override
public void run() {
try {
sleep(1000);
} catch (InterruptedException e) {}
block(BaseClass.get(bid));
}
});
}
return this; return this;
} }