fix #578: Wait for broadcasts with different case

Author: adazem009

src/engine/internal/engine.cpp

@@ -539,6 +539,7 @@ void Engine::step()
 
     // Resolve stopped broadcast scripts
     std::vector<Broadcast *> resolved;
+    std::vector<Thread *> resolvedThreads;
 
     for (const auto &[broadcast, senderThread] : m_broadcastSenders) {
         std::unordered_map<Broadcast *, std::vector<Script *>> *broadcastMap = nullptr;
@@ -566,13 +567,21 @@ void Engine::step()
             }
         }
 
-        if (!found) {
+        if (found) {
+            // If a broadcast with the same name but different case
+            // was considered stopped before, restore the promise.
+            if (std::find(resolvedThreads.begin(), resolvedThreads.end(), senderThread) != resolvedThreads.end()) {
+                senderThread->promise();
+                resolvedThreads.erase(std::remove(resolvedThreads.begin(), resolvedThreads.end(), senderThread), resolvedThreads.end());
+            }
+        } else {
             Thread *th = senderThread;
 
             if (std::find_if(m_threads.begin(), m_threads.end(), [th](std::shared_ptr<Thread> thread) { return thread.get() == th; }) != m_threads.end())
                 th->resolvePromise();
 
             resolved.push_back(broadcast);
+            resolvedThreads.push_back(th);
         }
     }
 

test/engine/engine_test.cpp

@@ -2249,3 +2249,20 @@ TEST(EngineTest, BroadcastStopsWaitBlocks)
     ASSERT_VAR(stage, "backdrop_passed");
     ASSERT_TRUE(GET_VAR(stage, "backdrop_passed")->value().toBool());
 }
+
+TEST(EngineTest, BroadcastAndWaitCaseInsensitive)
+{
+    // Regtest for #578
+    Project p("regtest_projects/578_broadcast_and_wait_case_insensitive.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());
+}