From 85814a5ae222d571045b0b2762fce46aff731024 Mon Sep 17 00:00:00 2001
From: buehlera <buehlera@tec-nb-buehlera>
Date: Mon, 26 Oct 2020 13:59:10 +0100
Subject: [PATCH] CodeConnectString -> Abfangen von null-Objekten eingefuegt
---
.../simulator/simcode/comm/CodeConnectString.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/comm/CodeConnectString.java b/src/tec/letsgoing/ardublock/simulator/simcode/comm/CodeConnectString.java
index 2628789..9708493 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/comm/CodeConnectString.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/comm/CodeConnectString.java
@@ -26,7 +26,18 @@ public class CodeConnectString extends SimCode {
@Override
public SimTypeString run(Arduino _arduino, SimCode functionHead) {
- out = "" + block1.run(_arduino, functionHead).toString() + " " + block2.run(_arduino, functionHead).toString();
+ if(block1 != null && block2 != null) {
+ out = "" + block1.run(_arduino, functionHead).toString() + " " + block2.run(_arduino, functionHead).toString();
+ }
+ else if(block1 == null && block2 != null) {
+ out = "" + block2.run(_arduino, functionHead).toString();
+ }
+ else if(block1 != null && block2 == null) {
+ out = "" + block1.run(_arduino, functionHead).toString();
+ }
+ else {
+ out = "";
+ }
return new SimTypeString(out);
}
--
GitLab