From 99c03b7dd8c4980cfc2de2908e15ff51a02cbdf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Sat, 30 Sep 2023 10:12:10 +0200
Subject: [PATCH] Fix to avoid nullpointer while loading session

---
 src/com/jpexs/decompiler/flash/gui/Main.java      | 11 +----------
 src/com/jpexs/decompiler/flash/gui/MainPanel.java |  2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/com/jpexs/decompiler/flash/gui/Main.java b/src/com/jpexs/decompiler/flash/gui/Main.java
index ea48fe5d1..9dc72e3b6 100644
--- a/src/com/jpexs/decompiler/flash/gui/Main.java
+++ b/src/com/jpexs/decompiler/flash/gui/Main.java
@@ -2784,16 +2784,7 @@ public class Main {
                     openFile(sourceInfos, () -> {
                         mainFrame.getPanel().tagTree.setSelectionPathString(Configuration.lastSessionSelection.get());
                         mainFrame.getPanel().tagListTree.setSelectionPathString(Configuration.lastSessionTagListSelection.get());
-                        if (mainFrame.getPanel().getCurrentView() == MainPanel.VIEW_RESOURCES) {
-                            mainFrame.getPanel().valueChanged(new TreeSelectionEvent(
-                                    mainFrame.getPanel().tagTree, mainFrame.getPanel().tagTree.getSelectionPath(), false, null, null
-                            ));
-                        }
-                        if (mainFrame.getPanel().getCurrentView() == MainPanel.VIEW_TAGLIST) {
-                            mainFrame.getPanel().valueChanged(new TreeSelectionEvent(
-                                    mainFrame.getPanel().tagListTree, mainFrame.getPanel().tagListTree.getSelectionPath(), false, null, null
-                            ));
-                        }
+                        mainFrame.getPanel().updateUiWithCurrentOpenable();
                         setSessionLoaded(true);
                     });
                 }
diff --git a/src/com/jpexs/decompiler/flash/gui/MainPanel.java b/src/com/jpexs/decompiler/flash/gui/MainPanel.java
index 382acfed6..e1055f557 100644
--- a/src/com/jpexs/decompiler/flash/gui/MainPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/MainPanel.java
@@ -1441,7 +1441,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
         return actionPanel;
     }
 
-    private void updateUiWithCurrentOpenable() {
+    public void updateUiWithCurrentOpenable() {
         switch (currentView) {
             case VIEW_RESOURCES:
                 TreeItem resourcesTi = (TreeItem) tagTree.getLastSelectedPathComponent();