Remove stopped threads in blocks implementation

Author: adazem009

src/blocks/looksblocks.cpp

@@ -85,6 +85,20 @@ void LooksBlocks::registerBlocks(IEngine *engine)
     engine->addFieldValue(this, "backward", Backward);
 }
 
+void LooksBlocks::onInit(IEngine *engine)
+{
+    engine->threadAboutToStop().connect([](VirtualMachine *vm) {
+        m_timeMap.erase(vm);
+
+        for (auto it = m_waitingBubbles.begin(); it != m_waitingBubbles.end();) {
+            if (it->second == vm)
+                m_waitingBubbles.erase(it);
+            else
+                it++;
+        }
+    });
+}
+
 void LooksBlocks::compileSayForSecs(Compiler *compiler)
 {
     compiler->addInput(MESSAGE);

src/blocks/looksblocks.h

@@ -61,6 +61,7 @@ class LooksBlocks : public IBlockSection
         std::string name() const override;
 
         void registerBlocks(IEngine *engine) override;
+        void onInit(IEngine *engine) override;
 
         static void compileSayForSecs(Compiler *compiler);
         static void compileSay(Compiler *compiler);

src/blocks/motionblocks.cpp

@@ -71,6 +71,14 @@ void MotionBlocks::registerBlocks(IEngine *engine)
     engine->addFieldValue(this, "all around", AllAround);
 }
 
+void MotionBlocks::onInit(IEngine *engine)
+{
+    engine->threadAboutToStop().connect([](VirtualMachine *vm) {
+        m_timeMap.erase(vm);
+        m_glideMap.erase(vm);
+    });
+}
+
 void MotionBlocks::compileMoveSteps(Compiler *compiler)
 {
     compiler->addInput(STEPS);

src/blocks/motionblocks.h

@@ -47,6 +47,7 @@ class MotionBlocks : public IBlockSection
         std::string name() const override;
 
         void registerBlocks(IEngine *engine) override;
+        void onInit(IEngine *engine) override;
 
         static void compileMoveSteps(Compiler *compiler);
         static void compileTurnRight(Compiler *compiler);

src/blocks/soundblocks.cpp

@@ -36,7 +36,15 @@ void SoundBlocks::registerBlocks(IEngine *engine)
 void SoundBlocks::onInit(IEngine *engine)
 {
     m_waitingSounds.clear();
-    // TODO: Remove stopped threads from m_waitingSounds
+
+    engine->threadAboutToStop().connect([](VirtualMachine *vm) {
+        for (auto it = m_waitingSounds.begin(); it != m_waitingSounds.end();) {
+            if (it->second == vm)
+                m_waitingSounds.erase(it);
+            else
+                it++;
+        }
+    });
 }
 
 bool SoundBlocks::compilePlayCommon(Compiler *compiler, bool untilDone, bool *byIndex)