yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 10:19:23 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1698_ghidra1_GhidraTestClientProject'

Browse source
This commit is contained in:
ghidra1 2022-01-26 17:38:14 -05:00
commit 1b8210b393
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Ghidra/Framework/Project/src/main/java/ghidra/framework/project/DefaultProjectManager.java
View file

@ -69,7 +69,7 @@ public class DefaultProjectManager implements ProjectManager {
protected DefaultProjectManager() { protected DefaultProjectManager() {
recentlyOpenedProjectsList = new ArrayList<>(); recentlyOpenedProjectsList = new ArrayList<>();
recentlyViewedProjectsList = new ArrayList<>(); recentlyViewedProjectsList = new ArrayList<>();
createUserToolChest(); userToolChest = createUserToolChest();
// get locator for last opened project // get locator for last opened project
lastOpenedProject = getLastOpenedProject(); lastOpenedProject = getLastOpenedProject();
// read known projects from ghidra preferences... // read known projects from ghidra preferences...
@ -479,17 +479,17 @@ public class DefaultProjectManager implements ProjectManager {
toolChest.replaceToolTemplate(template); toolChest.replaceToolTemplate(template);
} }
private void createUserToolChest() { protected ToolChest createUserToolChest() {
ToolChest toolChest = new ToolChestImpl();
userToolChest = new ToolChestImpl();
try { try {
if (userToolChest.getToolCount() == 0) { if (toolChest.getToolCount() == 0) {
installTools(userToolChest); installTools(toolChest);
} }
} }
catch (Exception e) { catch (Exception e) {
Msg.showError(LOG, null, "Tool Chest Error", "Failed to create tool chest.", e); Msg.showError(LOG, null, "Tool Chest Error", "Failed to create tool chest.", e);
} }
return userToolChest;
} }
/** /**