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 cb705ecc5..bd1a1acdf 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 @@ -382,6 +382,7 @@ public class ScriptPack extends AS3ClassTreeItem { } if (instrOffset == -1) { + lonelyBody.add(bodyIndex); break blk; } try { @@ -390,6 +391,7 @@ public class ScriptPack extends AS3ClassTreeItem { //ignore } if (pos == -1) { + lonelyBody.add(bodyIndex); break blk; } if (!bodyToPosToLine.containsKey(bodyIndex)) { 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 72f682e09..3b095a479 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 @@ -520,6 +520,14 @@ public class Configuration { @ConfigurationFile(".*\\.swc$") public static final ConfigurationItem playerLibLocation = null; + @ConfigurationDefaultDouble(0.7) + @ConfigurationName("gui.avm2.splitPane.vars.dividerLocationPercent") + public static final ConfigurationItem guiAvm2VarsSplitPaneDividerLocationPercent = null; + + @ConfigurationDefaultBoolean(true) + @ConfigurationCategory("script") + public static final ConfigurationItem debugHalt = null; + private enum OSId { WINDOWS, OSX, UNIX diff --git a/libsrc/ffdec_lib/src/com/jpexs/helpers/CancellableWorker.java b/libsrc/ffdec_lib/src/com/jpexs/helpers/CancellableWorker.java index 12ed75a03..df6ebec2e 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/helpers/CancellableWorker.java +++ b/libsrc/ffdec_lib/src/com/jpexs/helpers/CancellableWorker.java @@ -81,7 +81,15 @@ public abstract class CancellableWorker implements RunnableFuture { @Override public final boolean cancel(boolean mayInterruptIfRunning) { - return future.cancel(mayInterruptIfRunning); + boolean r = future.cancel(mayInterruptIfRunning); + if (r) { + workerCancelled(); + } + return r; + } + + public void workerCancelled() { + } @Override