From 78885be67ffb9c1ce7932a1d449e2545f25d5c89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Fri, 16 May 2025 07:54:47 +0200 Subject: [PATCH] Fixed: Nullpointer exception during SWF opening when Simple editor is active --- CHANGELOG.md | 2 ++ src/com/jpexs/decompiler/flash/gui/Main.java | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef80033e4..b45ff9294 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +### Fixed +- Nullpointer exception during SWF opening when Simple editor is active ## [23.0.0] - 2025-05-15 ### Added diff --git a/src/com/jpexs/decompiler/flash/gui/Main.java b/src/com/jpexs/decompiler/flash/gui/Main.java index df53114f9..843ce40d8 100644 --- a/src/com/jpexs/decompiler/flash/gui/Main.java +++ b/src/com/jpexs/decompiler/flash/gui/Main.java @@ -53,7 +53,9 @@ import com.jpexs.decompiler.flash.gui.pipes.FirstInstance; import com.jpexs.decompiler.flash.gui.soleditor.CookiesChangedListener; import com.jpexs.decompiler.flash.gui.soleditor.SharedObjectsStorage; import com.jpexs.decompiler.flash.gui.soleditor.SolEditorFrame; +import com.jpexs.decompiler.flash.gui.taglistview.TagListTreeModel; import com.jpexs.decompiler.flash.gui.tagtree.AbstractTagTreeModel; +import com.jpexs.decompiler.flash.gui.tagtree.TagTreeModel; import com.jpexs.decompiler.flash.helpers.SWFDecompilerPlugin; import com.jpexs.decompiler.flash.tags.DefineBinaryDataTag; import com.jpexs.decompiler.flash.tags.DefineVideoStreamTag; @@ -1820,7 +1822,8 @@ public class Main { if (isInited()) { if (resourcesPathStr == null) { - TreePath tp = mainFrame.getPanel().tagTree.getFullModel().getTreePath(fopenable); + TagTreeModel model = mainFrame.getPanel().tagTree.getFullModel(); + TreePath tp = model == null ? null : model.getTreePath(fopenable); if (tp != null) { mainFrame.getPanel().tagTree.setSelectionPath(tp); } @@ -1828,7 +1831,8 @@ public class Main { mainFrame.getPanel().tagTree.setSelectionPathString(resourcesPathStr); } if (tagListPathStr == null) { - TreePath tp = mainFrame.getPanel().tagListTree.getFullModel().getTreePath(fopenable); + TagListTreeModel model = mainFrame.getPanel().tagListTree.getFullModel(); + TreePath tp = model == null ? null : model.getTreePath(fopenable); if (tp != null) { mainFrame.getPanel().tagListTree.setSelectionPath(tp); }