From 3ed65ad03ef0d589e783e89f28cbc63abcc534cd Mon Sep 17 00:00:00 2001 From: Konloch Date: Sun, 4 Jul 2021 01:51:41 -0700 Subject: [PATCH] Fix Race Condition Nullpointer --- .../gui/resourceviewer/ResourceViewProcessing.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/ResourceViewProcessing.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/ResourceViewProcessing.java index 1d77f2d1..623aae4b 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/ResourceViewProcessing.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/ResourceViewProcessing.java @@ -81,6 +81,8 @@ public class ResourceViewProcessing extends PaneUpdaterThread } else { + updateUpdaterTextArea = new SearchableRSyntaxTextArea(); + final Decompiler decompiler = resourceViewPanel.decompiler; //perform decompiling inside of this thread @@ -89,7 +91,7 @@ public class ResourceViewProcessing extends PaneUpdaterThread //set the swing components on the swing thread SwingUtilities.invokeLater(() -> { - updateUpdaterTextArea = (SearchableRSyntaxTextArea) Configuration.rstaTheme.apply(new SearchableRSyntaxTextArea()); + Configuration.rstaTheme.apply(updateUpdaterTextArea); resourceViewPanel.textArea = updateUpdaterTextArea; resourceViewPanel.panel.add(updateUpdaterTextArea.getScrollPane());