Fix: auto deobfuscation config defaults to true (instead of false for…

… AS/1/2) version changed to 1.5.0u1
jindrapetrik · Apr 21, 2013 · a708dc0 · a708dc0
1 parent 701fa40
commit a708dc0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/trunk/src/com/jpexs/decompiler/flash/Main.java b/trunk/src/com/jpexs/decompiler/flash/Main.java
@@ -61,7 +61,7 @@ public class Main {
     public static String file;
     public static String maskURL;
     public static SWF swf;
-    public static final String version = "1.5.0";
+    public static final String version = "1.5.0u1";
     public static final String applicationName = "JPEXS Free Flash Decompiler v." + version;
     public static final String shortApplicationName = "FFDec";
     public static final String shortApplicationVerName = shortApplicationName + " v." + version;

diff --git a/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java b/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java
@@ -586,7 +586,7 @@ private static void getConstantPool(ConstantPool cpool, List localData, Stack<Gr
 
             if (ins.isBranch() || ins.isJump()) {
 
-                if ((Boolean) Configuration.getConfig("autoDeobfuscate", false) && (ins instanceof ActionIf) && !stack.isEmpty() && (stack.peek().isCompileTime() && (!stack.peek().hasSideEffect()))) {
+                if ((Boolean) Configuration.getConfig("autoDeobfuscate", true) && (ins instanceof ActionIf) && !stack.isEmpty() && (stack.peek().isCompileTime() && (!stack.peek().hasSideEffect()))) {
                     ActionIf aif = (ActionIf) ins;
                     if (aif.ignoreUsed && (!aif.jumpUsed)) {
                         ins.setIgnored(true);
@@ -873,7 +873,7 @@ private static boolean readActionListAtPos(List<GraphTargetItem> output, HashMap
                             } else if (next.equals("c")) {
                                 goaif = true;
                             }
-                        } else if ((Boolean) Configuration.getConfig("autoDeobfuscate", false) && top.isCompileTime() && (!top.hasSideEffect()) && ((!top.isVariableComputed()) || (top.isVariableComputed() && enableVariables && (!notCompileTime)))) {
+                        } else if ((Boolean) Configuration.getConfig("autoDeobfuscate", true) && top.isCompileTime() && (!top.hasSideEffect()) && ((!top.isVariableComputed()) || (top.isVariableComputed() && enableVariables && (!notCompileTime)))) {
                             //if(top.isCompileTime()) {
                             //if(false){
                             if (enableVariables) {