diff --git a/pom.xml b/pom.xml
index e204293..d01b886 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
de.srsoftware
web4rail
- 1.3.34
+ 1.3.35
Web4Rail
jar
Java Model Railway Control
diff --git a/src/main/java/de/srsoftware/web4rail/actions/ConditionalAction.java b/src/main/java/de/srsoftware/web4rail/actions/ConditionalAction.java
index 81e2fff..2c00956 100644
--- a/src/main/java/de/srsoftware/web4rail/actions/ConditionalAction.java
+++ b/src/main/java/de/srsoftware/web4rail/actions/ConditionalAction.java
@@ -85,7 +85,7 @@ public class ConditionalAction extends ActionList {
@Override
public String toString() {
if (conditions.isEmpty()) return "["+t("Click here to add conditions")+"]";
- return t("if ({})",conditions)+COL;
+ return t("if ({})",conditions)+": ";
}
@Override
diff --git a/src/main/java/de/srsoftware/web4rail/conditions/TrainHasTag.java b/src/main/java/de/srsoftware/web4rail/conditions/TrainHasTag.java
index 1490bc8..40972b6 100644
--- a/src/main/java/de/srsoftware/web4rail/conditions/TrainHasTag.java
+++ b/src/main/java/de/srsoftware/web4rail/conditions/TrainHasTag.java
@@ -5,6 +5,7 @@ import java.util.List;
import org.json.JSONObject;
+import de.srsoftware.web4rail.moving.Train;
import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Input;
import de.srsoftware.web4rail.tags.Window;
@@ -16,8 +17,11 @@ public class TrainHasTag extends Condition {
@Override
public boolean fulfilledBy(Context context) {
- if (tag == null) return true;
- return context.train().tags().contains(tag) != inverted;
+ if (isNull(tag)) return true;
+ Train train = context.train();
+ if (isNull(train)) return false;
+ if (isNull(train.tags())) return false;
+ return train.tags().contains(tag) != inverted;
}
@Override