From 7f6a1dfd87cc45427e67a7804b48bdd531de10f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Sat, 30 Sep 2023 22:14:41 +0200 Subject: [PATCH] Maybe fix inifinite decompilation on startup --- src/com/jpexs/decompiler/flash/gui/Main.java | 4 ++-- src/com/jpexs/decompiler/flash/gui/MainPanel.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/jpexs/decompiler/flash/gui/Main.java b/src/com/jpexs/decompiler/flash/gui/Main.java index 9a2fd4f78..5bbbb9e5e 100644 --- a/src/com/jpexs/decompiler/flash/gui/Main.java +++ b/src/com/jpexs/decompiler/flash/gui/Main.java @@ -2784,9 +2784,9 @@ public class Main { openFile(sourceInfos, () -> { mainFrame.getPanel().tagTree.setSelectionPathString(Configuration.lastSessionSelection.get()); mainFrame.getPanel().tagListTree.setSelectionPathString(Configuration.lastSessionTagListSelection.get()); - mainFrame.getPanel().reload(true); - mainFrame.getPanel().updateUiWithCurrentOpenable(); setSessionLoaded(true); + mainFrame.getPanel().reload(true); + mainFrame.getPanel().updateUiWithCurrentOpenable(); }); } } diff --git a/src/com/jpexs/decompiler/flash/gui/MainPanel.java b/src/com/jpexs/decompiler/flash/gui/MainPanel.java index bb421fc76..ce160983e 100644 --- a/src/com/jpexs/decompiler/flash/gui/MainPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/MainPanel.java @@ -5224,7 +5224,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se if ((treeItem instanceof AS3Package) && ((AS3Package) treeItem).isCompoundScript()) { final ScriptPack scriptLeaf = ((AS3Package) treeItem).getCompoundInitializerPack(); - if (!Main.isInited() || !Main.isWorking() || Main.isDebugging()) { + if (Main.isInited() && !Main.isWorking() && !Main.isDebugging()) { ABCPanel abcPanel = getABCPanel(); abcPanel.detailPanel.methodTraitPanel.methodCodePanel.clear(); abcPanel.setAbc(scriptLeaf.abc); @@ -5241,7 +5241,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se showCard(CARDACTIONSCRIPT3PANEL); } else if (treeItem instanceof ScriptPack) { final ScriptPack scriptLeaf = (ScriptPack) treeItem; - if (!Main.isInited() || !Main.isWorking() || Main.isDebugging()) { + if (Main.isInited() && !Main.isWorking() && !Main.isDebugging()) { ABCPanel abcPanel = getABCPanel(); abcPanel.detailPanel.methodTraitPanel.methodCodePanel.clear(); abcPanel.setAbc(scriptLeaf.abc);