LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-22 04:26:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

pcode export shows "Decompilation skipped" when AS decompilation is disabled fixed => Configuration checking moved to "not pcode" branch

Browse Source
This commit is contained in:
Honfika
2013-08-24 22:48:30 +02:00
parent ddab3b223a
commit 0ca09ff329
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
trunk/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java
View File

@@ -113,16 +113,16 @@ public class MethodBody implements Cloneable, Serializable {
System.err.println("Decompiling " + path);
}
String s = "";
if (!(Boolean) Configuration.getConfig("decompile", Boolean.TRUE)) {
s = "//Decompilation skipped";
if (hilight) {
s = Highlighting.hilighMethod(s, this.method_info);
}
return s;
}
if (pcode) {
s += code.toASMSource(constants, this, false);
} else {
if (!(Boolean) Configuration.getConfig("decompile", Boolean.TRUE)) {
s = "//Decompilation skipped";
if (hilight) {
s = Highlighting.hilighMethod(s, this.method_info);
}
return s;
}
try {
s += Helper.timedCall(new Callable<String>() {
@Override

3
trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
View File

@@ -21,6 +21,7 @@ import com.jpexs.decompiler.flash.RetryTask;
import com.jpexs.decompiler.flash.RunnableIOEx;
import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.SWFInputStream;
import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.helpers.Highlighting;
import com.jpexs.decompiler.flash.tags.CSMTextSettingsTag;
import com.jpexs.decompiler.flash.tags.DefineButton2Tag;
@@ -1158,7 +1159,7 @@ public class XFLConverter {
}
private static String convertActionScript(ASMSource as) {
String decompiledASHilighted = com.jpexs.decompiler.flash.action.Action.actionsToSource(as.getActions(SWF.DEFAULT_VERSION), SWF.DEFAULT_VERSION, as.toString());
String decompiledASHilighted = Action.actionsToSource(as.getActions(SWF.DEFAULT_VERSION), SWF.DEFAULT_VERSION, as.toString());
return as.getActionSourcePrefix() + Helper.indentRows(as.getActionSourceIndent(), Highlighting.stripHilights(decompiledASHilighted), Graph.INDENT_STRING) + as.getActionSourceSuffix();
}