From def79bd7a7a829cd20b6cf8395d691474681d5af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Sun, 21 Jan 2018 18:35:37 +0100 Subject: [PATCH] AS2 class detection - Fix seeing class where isn't --- .../jpexs/decompiler/flash/action/Action.java | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java index 2f813f080..28f4a0c6f 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java @@ -1431,15 +1431,25 @@ public abstract class Action implements GraphSourceItem { } } } + } else { + break; } } - List output2 = new ArrayList<>(); - for (int i = 0; i < prevCount; i++) { - output2.add(output.get(i)); - } - output2.add(new ClassActionItem(className, extendsOp, implementsOp, traits, traitsStatic)); - return output2; + boolean isAClass = !(traits.isEmpty() && extendsOp == null && implementsOp.isEmpty()); + if (isAClass) { + List output2 = new ArrayList<>(); + for (int i = 0; i < prevCount; i++) { + output2.add(output.get(i)); + } + output2.add(new ClassActionItem(className, extendsOp, implementsOp, traits, traitsStatic)); + return output2; + } else { + ok = false; + } + + } else { + ok = false; } }