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 b80825158..2310be52c 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 @@ -540,17 +540,19 @@ public abstract class Action implements GraphSourceItem { writer.appendNoHilight("; "); byte[] bytes = a.getBytes(version); writer.appendNoHilight(Helper.bytesToHexString(bytes)); - long fileOffset = a.getFileOffset(); - if (fileData != null && fileOffset != -1 && fileData.length > fileOffset + bytes.length - 1) { - writer.appendNoHilight(" ("); - for (int i = 0; i < bytes.length; i++) { - writer.appendNoHilight(Helper.byteToHex(fileData[(int) (fileOffset + i)])); - writer.appendNoHilight(" "); - } + if (Configuration.showOriginalBytesInPcodeHex.get()) { + long fileOffset = a.getFileOffset(); + if (fileData != null && fileOffset != -1 && fileData.length > fileOffset + bytes.length - 1) { + writer.appendNoHilight(" ("); + for (int i = 0; i < bytes.length; i++) { + writer.appendNoHilight(Helper.byteToHex(fileData[(int) (fileOffset + i)])); + writer.appendNoHilight(" "); + } - writer.appendNoHilight("@"); - writer.appendNoHilight(Helper.formatHex(a.getFileOffset(), 8)); - writer.appendNoHilight(")"); + writer.appendNoHilight("@"); + writer.appendNoHilight(Helper.formatHex(fileOffset, 8)); + writer.appendNoHilight(")"); + } } writer.newLine(); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java index fc5f1877a..71afa4a19 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java @@ -175,6 +175,11 @@ public class Configuration { @ConfigurationCategory("script") public static final ConfigurationItem resolveConstants = null; + @ConfigurationDefaultBoolean(false) + @ConfigurationCategory("script") + @ConfigurationInternal + public static final ConfigurationItem showOriginalBytesInPcodeHex = null; + /** * Limit of code subs (for obfuscated code) */ diff --git a/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java b/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java index 549216d82..e3a30d09f 100644 --- a/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java @@ -131,6 +131,8 @@ public class ActionPanel extends JPanel implements SearchListener