mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2025-10-04 10:19:23 +02:00
Merge remote-tracking branch 'origin/GP-1698_ghidra1_GhidraTestClientProject'
This commit is contained in:
commit
1b8210b393
1 changed files with 6 additions and 6 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue