From 3d11d1fa870b54e4ce5cb21fcc11e02f083d75ea Mon Sep 17 00:00:00 2001
From: Skylot <118523+skylot@users.noreply.github.com>
Date: Sat, 19 Jul 2025 22:14:30 +0100
Subject: [PATCH] fix(gui): resolve NPE on code area close

---
 .../java/jadx/gui/ui/codearea/AbstractCodeArea.java   | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/AbstractCodeArea.java b/jadx-gui/src/main/java/jadx/gui/ui/codearea/AbstractCodeArea.java
index 131204ac7..e12fc24e3 100644
--- a/jadx-gui/src/main/java/jadx/gui/ui/codearea/AbstractCodeArea.java
+++ b/jadx-gui/src/main/java/jadx/gui/ui/codearea/AbstractCodeArea.java
@@ -479,12 +479,7 @@ public abstract class AbstractCodeArea extends RSyntaxTextArea {
 	}
 
 	public void dispose() {
-		// code area reference can still be used somewhere in UI objects,
-		// reset node reference to allow to GC jadx objects tree
-		node = null;
-		contentPanel = null;
-
-		// also clear internals
+		// clear internals
 		try {
 			setIgnoreRepaint(true);
 			setText("");
@@ -513,6 +508,10 @@ public abstract class AbstractCodeArea extends RSyntaxTextArea {
 		} catch (Throwable e) {
 			LOG.debug("Error on code area dispose", e);
 		}
+		// code area reference can still be used somewhere in UI objects,
+		// reset node reference to allow to GC jadx objects tree
+		node = null;
+		contentPanel = null;
 	}
 
 	@Override