From 457d5f3084a4460e39c13474c31f91eab03640d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Sat, 20 Nov 2021 20:10:06 +0100 Subject: [PATCH] Fixed AS2 direct editation of classes - missing _global prefix --- CHANGELOG.md | 1 + .../flash/action/parser/script/ActionSourceGenerator.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15d95711e..c82f45473 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file. - AS1/2 handle declaration of registers in certain cases - AS1/2 setProperty, getProperty handling - [#1750] Application won't start when cannot access font file +- AS2 direct editation of classes - missing _global prefix ## [14.5.1] - 2021-11-20 ### Fixed diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/ActionSourceGenerator.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/ActionSourceGenerator.java index 9e322e698..d49a837b0 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/ActionSourceGenerator.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/ActionSourceGenerator.java @@ -705,11 +705,11 @@ public class ActionSourceGenerator implements SourceGenerator { if (!isInterface) { val.add(new ActionStoreRegister(1)); } - constr.addAll(typeToActions(nameStr, val)); + constr.addAll(typeToActions(globalClassTypeStr, val)); } else { constr.addAll(toActionList(((FunctionActionItem) constructor).toSource(localData, this))); constr.add(new ActionStoreRegister(1)); - constr = (typeToActions(nameStr, constr)); + constr = (typeToActions(globalClassTypeStr, constr)); } if (!isInterface) { for (int pass = 1; pass <= 2; pass++) { //two passes, methods first, then variables @@ -738,7 +738,7 @@ public class ActionSourceGenerator implements SourceGenerator { if (!isInterface) { ifbody.add(new ActionPush((Long) 1L)); ifbody.add(new ActionPush(Null.INSTANCE)); - ifbody.addAll(typeToActions(nameStr, null)); + ifbody.addAll(typeToActions(globalClassTypeStr, null)); ifbody.add(pushConst("prototype")); ifbody.add(new ActionGetMember()); ifbody.add(new ActionPush((Long) 3L));