From 9d0ddb8c6c2bfd983d52a2c80d2681e098a9cc7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Sat, 13 Jan 2024 20:39:54 +0100 Subject: [PATCH] Fixed Nullpointer on recent searches loader --- CHANGELOG.md | 1 + .../decompiler/flash/gui/MainFrameRibbonMenu.java | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c73073dc..e115c460e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ All notable changes to this project will be documented in this file. - [#2175] FLA Export - exporting 320kbps MP3s as 160kbps - [#2178] Undo on sprites - [#2176] Reset letterspacing on text import +- Nullpointer on recent searches loader ## [20.1.0] - 2023-12-30 ### Added diff --git a/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java b/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java index 6822f0903..389d4d84b 100644 --- a/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java +++ b/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java @@ -173,8 +173,15 @@ public class MainFrameRibbonMenu extends MainFrameMenu { searchHistoryPanel.addButtonGroup(groupName); Openable openable = Main.getMainFrame().getPanel().getCurrentOpenable(); - SWF swf = (openable instanceof SWF) ? (SWF) openable : ((ABC) openable).getSwf(); - List indices = Main.searchResultsStorage.getIndicesForOpenable(openable); + SWF swf; + if (openable == null) { + swf = null; + } else if (openable instanceof SWF) { + swf = (SWF) openable; + } else { + swf = ((ABC) openable).getSwf(); + } + List indices = openable == null ? new ArrayList<>() : Main.searchResultsStorage.getIndicesForOpenable(openable); int height = 0; height = searchHistoryPanel.getInsets().top + searchHistoryPanel.getInsets().bottom + 6/*groupInset top*/ + new JLabel(groupName).getPreferredSize().height + 4 /*layoutGap*/;