From bef61a1123f934c275cb9f394457f6486a907b3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Thu, 28 Sep 2023 12:14:08 +0200 Subject: [PATCH] Cannot import compound scripts. --- .../src/com/jpexs/decompiler/flash/abc/ScriptPack.java | 4 ++++ .../jpexs/decompiler/flash/importers/AS3ScriptImporter.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ScriptPack.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ScriptPack.java index b2630cd23..c913e0c9c 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ScriptPack.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ScriptPack.java @@ -91,6 +91,10 @@ public class ScriptPack extends AS3ClassTreeItem { private final ClassPath path; + /** + * Is the scriptpack simple? ScriptPack can be either simple or compound. + * Compound = Contains more than one externally visible definitions. + */ public boolean isSimple = false; public boolean scriptInitializerIsEmpty = false; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/AS3ScriptImporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/AS3ScriptImporter.java index 560d31a7c..05f7ead39 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/AS3ScriptImporter.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/AS3ScriptImporter.java @@ -51,6 +51,9 @@ public class AS3ScriptImporter { if (Thread.currentThread().isInterrupted()) { return importCount; } + if (!pack.isSimple) { + continue; + } try { File file = pack.getExportFile(scriptsFolder, new ScriptExportSettings(ScriptExportMode.AS, false, false, false, false)); if (file.exists()) {