From 4dd7769c4a897ceb68fdad23410814f6f9de6ffe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=F8=EDk?= <jindra.petrik@gmail.com>
Date: Fri, 3 May 2013 21:23:28 +0200
Subject: [PATCH] AndItem,OrItem fix back

---
 .../jpexs/decompiler/flash/graph/Graph.java   | 26 ++++---------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java b/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java
index 3a9165703..c9dec2d94 100644
--- a/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java
+++ b/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java
@@ -558,20 +558,9 @@ public class Graph {
                     if ((ti = checkLoop(next, stopPart, loops)) != null) {
                         ret.add(ti);
                     } else {
+                        printGraph(localData, stack, allParts, parent, next, reversed ? sp1 : sp0, loops, forFinalCommands);
+                        GraphTargetItem second = stack.pop();
                         GraphTargetItem first = stack.pop();
-                        GraphTargetItem second = null;
-                        if (first.isCompileTime() && (reversed == first.toBoolean())) {
-                            second = new TrueItem(null);
-                        } else {
-                            printGraph(localData, stack, allParts, parent, next, reversed ? sp1 : sp0, loops, forFinalCommands);
-                            try {
-                                second = stack.pop();
-                            } catch (EmptyStackException ese) {
-                                ese.printStackTrace();
-                                System.err.println(part.toString());
-                                System.out.println("" + first.isCompileTime() + first.toBoolean());
-                            }
-                        }
                         if (!reversed) {
                             AndItem a = new AndItem(null, first, second);
                             stack.push(a);
@@ -617,15 +606,10 @@ public class Graph {
                     if ((ti = checkLoop(next, stopPart, loops)) != null) {
                         ret.add(ti);
                     } else {
-                        GraphTargetItem first = stack.pop();
-                        GraphTargetItem second = null;
-                        if (first.isCompileTime() && (reversed == !first.toBoolean())) {
-                            second = new TrueItem(null);
-                        } else {
-                            printGraph(localData, stack, allParts, parent, next, reversed ? sp1 : sp0, loops, forFinalCommands);
-                            second = stack.pop();
-                        }
+                        printGraph(localData, stack, allParts, parent, next, reversed ? sp1 : sp0, loops, forFinalCommands);
 
+                        GraphTargetItem second = stack.pop();
+                        GraphTargetItem first = stack.pop();
 
                         if (reversed) {
                             AndItem a = new AndItem(null, first, second);