fix #660: Stop the entire thread in stop all and delete this clone

Author: adazem009

src/blocks/controlblocks.cpp

@@ -90,7 +90,8 @@ CompilerValue *ControlBlocks::compileStop(Compiler *compiler)
 
         if (str == "all") {
             compiler->addFunctionCallWithCtx("control_stop_all", Compiler::StaticType::Void);
-            compiler->createStop();
+            compiler->invalidateTarget(); // if this is a clone, it doesn't exist anymore
+            compiler->createThreadStop();
         } else if (str == "this script")
             compiler->createStop();
         else if (str == "other scripts in sprite" || str == "other scripts in stage")
@@ -181,7 +182,8 @@ CompilerValue *ControlBlocks::compileDeleteThisClone(Compiler *compiler)
 {
     CompilerValue *deleted = compiler->addTargetFunctionCall("control_delete_this_clone", Compiler::StaticType::Bool);
     compiler->beginIfStatement(deleted);
-    compiler->createStopWithoutSync(); // sync happens before the function call
+    compiler->invalidateTarget(); // the sprite doesn't exist anymore
+    compiler->createThreadStop(); // callers should be stopped too
     compiler->endIf();
     return nullptr;
 }

test/engine/engine_test.cpp

@@ -2280,3 +2280,105 @@ TEST(EngineTest, BroadcastAndWaitCaseInsensitive)
     ASSERT_VAR(stage, "passed");
     ASSERT_TRUE(GET_VAR(stage, "passed")->value().toBool());
 }
+
+TEST(EngineTest, CloneScriptsAreStoppedFromProcedureDeletingTheClone)
+{
+    // Regtest for #660
+    Project p("regtest_projects/660_stop_script_from_procedure_clone.sb3");
+    ASSERT_TRUE(p.load());
+
+    auto engine = p.engine();
+
+    Stage *stage = engine->stage();
+    ASSERT_TRUE(stage);
+
+    engine->run();
+
+    ASSERT_VAR(stage, "passed");
+    ASSERT_TRUE(GET_VAR(stage, "passed")->value().toBool());
+}
+
+TEST(EngineTest, ScriptsAreNotStoppedFromProcedureStoppingTheProcedureScript)
+{
+    // Regtest for #660
+    Project p("regtest_projects/660_stop_script_from_procedure_stop_this_script.sb3");
+    ASSERT_TRUE(p.load());
+
+    auto engine = p.engine();
+
+    Stage *stage = engine->stage();
+    ASSERT_TRUE(stage);
+
+    engine->run();
+
+    ASSERT_VAR(stage, "passed");
+    ASSERT_TRUE(GET_VAR(stage, "passed")->value().toBool());
+}
+
+TEST(EngineTest, ScriptsAreNotStoppedFromProcedureStoppingOtherScripts)
+{
+    // Regtest for #660
+    Project p("regtest_projects/660_stop_script_from_procedure_stop_other_scripts.sb3");
+    ASSERT_TRUE(p.load());
+
+    auto engine = p.engine();
+
+    Stage *stage = engine->stage();
+    ASSERT_TRUE(stage);
+
+    engine->run();
+
+    ASSERT_VAR(stage, "passed");
+    ASSERT_TRUE(GET_VAR(stage, "passed")->value().toBool());
+}
+
+TEST(EngineTest, ScriptsAreStoppedFromProcedureStoppingAll)
+{
+    // Regtest for #660
+    Project p("regtest_projects/660_stop_script_from_procedure_stop_all.sb3");
+    ASSERT_TRUE(p.load());
+
+    auto engine = p.engine();
+
+    Stage *stage = engine->stage();
+    ASSERT_TRUE(stage);
+
+    engine->run();
+
+    ASSERT_VAR(stage, "passed");
+    ASSERT_TRUE(GET_VAR(stage, "passed")->value().toBool());
+}
+
+TEST(EngineTest, ScriptsAreStoppedFromProcedureStoppingAll_NonWarp)
+{
+    // Regtest for #660
+    Project p("regtest_projects/660_stop_script_from_procedure_stop_all_non_warp.sb3");
+    ASSERT_TRUE(p.load());
+
+    auto engine = p.engine();
+
+    Stage *stage = engine->stage();
+    ASSERT_TRUE(stage);
+
+    engine->run();
+
+    ASSERT_VAR(stage, "passed");
+    ASSERT_TRUE(GET_VAR(stage, "passed")->value().toBool());
+}
+
+TEST(EngineTest, ScriptsAreStoppedFromProcedureStoppingAll_Nested)
+{
+    // Regtest for #660
+    Project p("regtest_projects/660_stop_script_from_procedure_stop_all_nested.sb3");
+    ASSERT_TRUE(p.load());
+
+    auto engine = p.engine();
+
+    Stage *stage = engine->stage();
+    ASSERT_TRUE(stage);
+
+    engine->run();
+
+    ASSERT_VAR(stage, "passed");
+    ASSERT_TRUE(GET_VAR(stage, "passed")->value().toBool());
+}