github/ghidra
1
1
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-01-10 06:27:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

GP-5698: Don't go to parent unless we have ghidra.repos.config.

Browse Source
This commit is contained in:
Dan
2025-05-16 15:48:38 +00:00
parent 0b8985a257
commit dbd574cfb2
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Ghidra/Features/GhidraServer/src/main/java/ghidra/server/remote/GhidraServerApplicationLayout.java
View File

@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -46,7 +46,7 @@ public class GhidraServerApplicationLayout extends ApplicationLayout {
// Application installation directory
applicationInstallationDir = getApplicationRootDirs().iterator().next().getParentFile();
if (SystemUtilities.isInDevelopmentMode()) {
if (SystemUtilities.isInDevelopmentMode() && getApplicationRootDirs().size() > 1) {
applicationInstallationDir = applicationInstallationDir.getParentFile();
}

6
Ghidra/Framework/Generic/src/main/java/generic/application/GenericApplicationLayout.java
View File

@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -96,7 +96,7 @@ public class GenericApplicationLayout extends ApplicationLayout {
// Application installation directory
applicationInstallationDir = applicationRootDirs.iterator().next().getParentFile();
if (SystemUtilities.isInDevelopmentMode()) {
if (SystemUtilities.isInDevelopmentMode() && applicationRootDirs.size() > 1) {
applicationInstallationDir = applicationInstallationDir.getParentFile();
}

2
Ghidra/Framework/Utility/src/main/java/ghidra/GhidraApplicationLayout.java
View File

@@ -133,7 +133,7 @@ public class GhidraApplicationLayout extends ApplicationLayout {
}
ResourceFile dir = applicationRootDirs.iterator().next().getParentFile();
if (SystemUtilities.isInDevelopmentMode()) {
if (SystemUtilities.isInDevelopmentMode() && applicationRootDirs.size() > 1) {
dir = dir.getParentFile();
}
return dir;