From 2b9fc72bafc21706550ba4ced860dde8b44ff8de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Sun, 4 Feb 2018 08:35:20 +0100 Subject: [PATCH] Correctly handling TagScript on getASMs --- libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java index b926843d5..f6a249ee6 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java @@ -1711,8 +1711,9 @@ public final class SWF implements SWFContainerItem, Timelined { } private void getASMs(boolean exportFileNames, TreeItem treeItem, List nodesToExport, boolean exportAll, Map asmsToExport, String path) { - boolean exportNode = nodesToExport.contains(treeItem); TreeItem realItem = treeItem instanceof TagScript ? ((TagScript) treeItem).getTag() : treeItem; + boolean exportNode = nodesToExport.contains(treeItem) || nodesToExport.contains(realItem); + if (realItem instanceof ASMSource && (exportAll || exportNode)) { String npath = path; String exPath = path; @@ -2989,8 +2990,7 @@ public final class SWF implements SWFContainerItem, Timelined { timelined.setModified(true); timelined.resetTimeline(); } else // timeline should be always the swf here - { - if (removeDependencies) { + if (removeDependencies) { removeTagWithDependenciesFromTimeline(tag, timelined.getTimeline()); timelined.setModified(true); } else { @@ -2999,7 +2999,6 @@ public final class SWF implements SWFContainerItem, Timelined { timelined.setModified(true); } } - } } @Override