From a98d02f5d3540867d38a3a50956dadb1328c0423 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Sat, 3 Aug 2024 08:59:29 +0200 Subject: [PATCH] Fixed: Duplicate pack path message on compound scripts --- CHANGELOG.md | 1 + libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9dfa9c375..9b8074003 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -88,6 +88,7 @@ All notable changes to this project will be documented in this file. - AS3 PCode - pushbyte operand docs - signed byte - [#2226] Incorrect decompilation of continue statements in some cases - AS3 Embedded assets export - assets.swf not working, incorrect binary data extension for swfs +- Duplicate pack path message on compound scripts ### Changed - [#2185] MochiCrypt no longer offered for auto decrypt, user needs to choose variant from "Use unpacker" menu 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 b2f33d5d3..1674db1f8 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java @@ -2228,9 +2228,9 @@ public final class SWF implements SWFContainerItem, Timelined, Openable { private List uniqueAS3Packs(List packs) { List ret = new ArrayList<>(); Set classPaths = new HashSet<>(); - for (ScriptPack item : packs) { + for (ScriptPack item : packs) { ClassPath key = item.getClassPath(); - if (classPaths.contains(key)) { + if (classPaths.contains(key) && item.isSimple) { logger.log(Level.SEVERE, "Duplicate pack path found ({0})!", key); } else { classPaths.add(key);