From 10ec4234910da2063108555c359ce0d7cdb55b15 Mon Sep 17 00:00:00 2001
From: "honfika@gmail.com" <honfika@gmail.com>
Date: Wed, 6 May 2015 13:31:19 +0200
Subject: [PATCH] AS3 search fix

---
 .../jpexs/decompiler/flash/gui/MainPanel.java   | 17 +++++------------
 .../decompiler/flash/gui/abc/ABCPanel.java      |  1 +
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/com/jpexs/decompiler/flash/gui/MainPanel.java b/src/com/jpexs/decompiler/flash/gui/MainPanel.java
index 40178f94c..a6dffcc54 100644
--- a/src/com/jpexs/decompiler/flash/gui/MainPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/MainPanel.java
@@ -1314,10 +1314,6 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
 
                                 if (getABCPanel().search(txt, searchDialog.ignoreCaseCheckBox.isSelected(), searchDialog.regexpCheckBox.isSelected())) {
                                     found = true;
-                                    View.execInEventDispatch(() -> {
-                                        showDetail(DETAILCARDAS3NAVIGATOR);
-                                        showCard(CARDACTIONSCRIPT3PANEL);
-                                    });
                                 }
                             } else {
                                 // todo: honfika: do not call this from background thread
@@ -1327,9 +1323,6 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
 
                                 if (getActionPanel().search(txt, searchDialog.ignoreCaseCheckBox.isSelected(), searchDialog.regexpCheckBox.isSelected())) {
                                     found = true;
-                                    View.execInEventDispatch(() -> {
-                                        showCard(CARDACTIONSCRIPTPANEL);
-                                    });
                                 }
                             }
                         } else if (searchDialog.searchInTextsRadioButton.isSelected()) {
@@ -2583,11 +2576,11 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
 
                     @Override
                     protected Void doInBackground() throws Exception {
-                        getABCPanel().detailPanel.methodTraitPanel.methodCodePanel.clear();
-                        getABCPanel().navigator.setAbc(scriptLeaf.abc);
-                        getABCPanel().setAbc(scriptLeaf.abc);
-                        getABCPanel().decompiledTextArea.setScript(scriptLeaf);
-                        getABCPanel().decompiledTextArea.setNoTrait();
+                        ABCPanel abcPanel = getABCPanel();
+                        abcPanel.detailPanel.methodTraitPanel.methodCodePanel.clear();
+                        abcPanel.setAbc(scriptLeaf.abc);
+                        abcPanel.decompiledTextArea.setScript(scriptLeaf);
+                        abcPanel.decompiledTextArea.setNoTrait();
                         return null;
                     }
 
diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
index 2d7ecb2e8..cb68c181d 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
@@ -224,6 +224,7 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<ABC
 
     public void setAbc(ABC abc) {
         this.abc = abc;
+        navigator.setAbc(abc);
         updateConstList();
     }