From 69c3871cba61e58a7f257790bd68f041a0a762b8 Mon Sep 17 00:00:00 2001 From: ghidra1 Date: Mon, 24 Jan 2022 15:29:45 -0500 Subject: [PATCH] GP-1698 allow DefaultProjectManager to be override with empty tool chest --- .../framework/project/DefaultProjectManager.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/DefaultProjectManager.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/DefaultProjectManager.java index e7b4f377c3..26b0b1e50b 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/DefaultProjectManager.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/DefaultProjectManager.java @@ -69,7 +69,7 @@ public class DefaultProjectManager implements ProjectManager { protected DefaultProjectManager() { recentlyOpenedProjectsList = new ArrayList<>(); recentlyViewedProjectsList = new ArrayList<>(); - createUserToolChest(); + userToolChest = createUserToolChest(); // get locator for last opened project lastOpenedProject = getLastOpenedProject(); // read known projects from ghidra preferences... @@ -479,17 +479,17 @@ public class DefaultProjectManager implements ProjectManager { toolChest.replaceToolTemplate(template); } - private void createUserToolChest() { - - userToolChest = new ToolChestImpl(); + protected ToolChest createUserToolChest() { + ToolChest toolChest = new ToolChestImpl(); try { - if (userToolChest.getToolCount() == 0) { - installTools(userToolChest); + if (toolChest.getToolCount() == 0) { + installTools(toolChest); } } catch (Exception e) { Msg.showError(LOG, null, "Tool Chest Error", "Failed to create tool chest.", e); } + return userToolChest; } /**