LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-17 21:38:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

script halt config, lib part commit

Browse Source
This commit is contained in:
Jindra Petřík
2015-11-17 17:49:06 +01:00
parent bb37910cce
commit 727371ffb5
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ScriptPack.java
View File

@@ -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)) {

8
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
View File

@@ -520,6 +520,14 @@ public class Configuration {
@ConfigurationFile(".*\\.swc$")
public static final ConfigurationItem<String> playerLibLocation = null;
@ConfigurationDefaultDouble(0.7)
@ConfigurationName("gui.avm2.splitPane.vars.dividerLocationPercent")
public static final ConfigurationItem<Double> guiAvm2VarsSplitPaneDividerLocationPercent = null;
@ConfigurationDefaultBoolean(true)
@ConfigurationCategory("script")
public static final ConfigurationItem<Boolean> debugHalt = null;
private enum OSId {
WINDOWS, OSX, UNIX

10
libsrc/ffdec_lib/src/com/jpexs/helpers/CancellableWorker.java
View File

@@ -81,7 +81,15 @@ public abstract class CancellableWorker<T> implements RunnableFuture<T> {
@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