Fix local variables default values when the wait action is used

4ian · Jun 25, 2024 · 183e7fc · 183e7fc
1 parent f909675
commit 183e7fc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp b/Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp
@@ -709,11 +709,14 @@ EventsCodeGenerator::GenerateCallback(
   const gd::String actionsDeclarationsCode =
       GenerateObjectsDeclarationCode(callbackContext);
 
-  const gd::String callbackCode =
-      callbackFunctionName + " = function (" +
-      GenerateEventsParameters(callbackContext) + ") {\n" +
-      restoreLocalVariablesCode +
-      actionsDeclarationsCode + actionsCode + "}\n";
+  const gd::String clearLocalVariablesCode =
+      GenerateLocalVariablesStackAccessor() + ".length = 0;\n";
+
+  const gd::String callbackCode = callbackFunctionName + " = function (" +
+                                  GenerateEventsParameters(callbackContext) +
+                                  ") {\n" + restoreLocalVariablesCode +
+                                  actionsDeclarationsCode + actionsCode +
+                                  clearLocalVariablesCode + "}\n";
 
   AddCustomCodeOutsideMain(callbackCode);
 

diff --git a/GDJS/GDJS/Extensions/Builtin/AsyncExtension.cpp b/GDJS/GDJS/Extensions/Builtin/AsyncExtension.cpp
@@ -16,8 +16,7 @@ AsyncExtension::AsyncExtension() {
   gd::BuiltinExtensionsImplementer::ImplementsAsyncExtension(*this);
 
   GetAllEvents()["BuiltinAsync::Async"].SetCodeGenerator(
-      [](gd::BaseEvent &event_,
-         gd::EventsCodeGenerator &codeGenerator,
+      [](gd::BaseEvent &event_, gd::EventsCodeGenerator &codeGenerator,
          gd::EventsCodeGenerationContext &parentContext) {
         gd::AsyncEvent &event = dynamic_cast<gd::AsyncEvent &>(event_);
 
@@ -71,7 +70,8 @@ AsyncExtension::AsyncExtension() {
         }
 
         return "{\n" + parentAsyncObjectsListGetter + "{\n" +
-               asyncContextBuilder + asyncActionCode + "}\n" + "}\n";
+               asyncContextBuilder + asyncActionCode +
+               "}\n" + "}\n";
       });
 
   GetAllActions()["BuiltinAsync::ResolveAsyncEventsFunction"].SetFunctionName(