InputValue: Set block ID properly

adazem009 · adazem009 · commit d54ccbce7e45 · 2023-08-17T11:58:19.000+02:00
diff --git a/src/scratch/inputvalue.cpp b/src/scratch/inputvalue.cpp
@@ -2,7 +2,7 @@
 
 #include <scratchcpp/inputvalue.h>
 #include <scratchcpp/compiler.h>
-#include <scratchcpp/entity.h>
+#include <scratchcpp/block.h>
 #include <scratchcpp/broadcast.h>
 #include <scratchcpp/variable.h>
 #include <scratchcpp/list.h>
@@ -86,6 +86,11 @@ const std::shared_ptr<Block> &InputValue::valueBlock() const
 void InputValue::setValueBlock(const std::shared_ptr<Block> &newValueBlock)
 {
     impl->valueBlock = newValueBlock;
+
+    if (newValueBlock)
+        impl->valueBlockId = newValueBlock->id();
+    else
+        impl->valueBlockId = "";
 }
 
 /*! Returns the ID of the block. \see valueBlock() */
@@ -98,6 +103,7 @@ const std::string &InputValue::valueBlockId() const
 void InputValue::setValueBlockId(const std::string &newValueBlockId)
 {
     impl->valueBlockId = newValueBlockId;
+    impl->valueBlock = nullptr;
 }
 
 /*! Returns a pointer to the value (e. g. a variable). */

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`#include <scratchcpp/inputvalue.h>`
`4`	`4`	`#include <scratchcpp/compiler.h>`
`5`		`-#include <scratchcpp/entity.h>`
	`5`	`+#include <scratchcpp/block.h>`
`6`	`6`	`#include <scratchcpp/broadcast.h>`
`7`	`7`	`#include <scratchcpp/variable.h>`
`8`	`8`	`#include <scratchcpp/list.h>`
`@@ -86,6 +86,11 @@ const std::shared_ptr<Block> &InputValue::valueBlock() const`
`86`	`86`	`void InputValue::setValueBlock(const std::shared_ptr<Block> &newValueBlock)`
`87`	`87`	`{`
`88`	`88`	`impl->valueBlock = newValueBlock;`
	`89`	`+`
	`90`	`+ if (newValueBlock)`
	`91`	`+ impl->valueBlockId = newValueBlock->id();`
	`92`	`+ else`
	`93`	`+ impl->valueBlockId = "";`
`89`	`94`	`}`
`90`	`95`
`91`	`96`	`/! Returns the ID of the block. \see valueBlock() /`
`@@ -98,6 +103,7 @@ const std::string &InputValue::valueBlockId() const`
`98`	`103`	`void InputValue::setValueBlockId(const std::string &newValueBlockId)`
`99`	`104`	`{`
`100`	`105`	`impl->valueBlockId = newValueBlockId;`
	`106`	`+ impl->valueBlock = nullptr;`
`101`	`107`	`}`
`102`	`108`
`103`	`109`	`/! Returns a pointer to the value (e. g. a variable). /`