From 12dc4fde8a07a4bf56fef140a60e8b3a11a31ee5 Mon Sep 17 00:00:00 2001 From: Skylot Date: Tue, 27 Oct 2020 08:53:11 +0000 Subject: [PATCH] fix(gui): clear jumps history on file close --- jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java | 2 +- jadx-gui/src/main/java/jadx/gui/ui/TabbedPane.java | 6 ++++++ jadx-gui/src/main/java/jadx/gui/utils/JumpManager.java | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java b/jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java index d6845d24..ee41542c 100644 --- a/jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java +++ b/jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java @@ -512,7 +512,7 @@ public class MainWindow extends JFrame { } private void clearTree() { - tabbedPane.closeAllTabs(); + tabbedPane.reset(); resetCache(); treeRoot = null; treeModel.setRoot(null); diff --git a/jadx-gui/src/main/java/jadx/gui/ui/TabbedPane.java b/jadx-gui/src/main/java/jadx/gui/ui/TabbedPane.java index 72ff21eb..7fdd18d2 100644 --- a/jadx-gui/src/main/java/jadx/gui/ui/TabbedPane.java +++ b/jadx-gui/src/main/java/jadx/gui/ui/TabbedPane.java @@ -214,4 +214,10 @@ public class TabbedPane extends JTabbedPane { } } } + + public void reset() { + closeAllTabs(); + openTabs.clear(); + jumps.reset(); + } } diff --git a/jadx-gui/src/main/java/jadx/gui/utils/JumpManager.java b/jadx-gui/src/main/java/jadx/gui/utils/JumpManager.java index 390e9299..355b5b82 100644 --- a/jadx-gui/src/main/java/jadx/gui/utils/JumpManager.java +++ b/jadx-gui/src/main/java/jadx/gui/utils/JumpManager.java @@ -87,4 +87,8 @@ public class JumpManager { currentPos = newPos; return position; } + + public void reset() { + list.clear(); + } } -- GitLab