From 3cd6df931d2b0d6aebc1c867b5397679e4d708be Mon Sep 17 00:00:00 2001
From: Stephan Richter <github@keawe.de>
Date: Sat, 6 Feb 2021 20:30:33 +0100
Subject: [PATCH] bugfixes

---
 pom.xml                                                   | 2 +-
 .../de/srsoftware/web4rail/actions/ConditionalAction.java | 2 +-
 .../de/srsoftware/web4rail/conditions/TrainHasTag.java    | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index e204293..d01b886 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.srsoftware</groupId>
 	<artifactId>web4rail</artifactId>
-	<version>1.3.34</version>
+	<version>1.3.35</version>
 	<name>Web4Rail</name>
 	<packaging>jar</packaging>
 	<description>Java Model Railway Control</description>
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