diff --git a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/GhidraDev_README.html b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/GhidraDev_README.html
index c3c0c8cf21..d8aac87775 100644
--- a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/GhidraDev_README.html
+++ b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/GhidraDev_README.html
@@ -53,8 +53,16 @@ change with future releases.
Change History
-2.1.1: Python debugging now works when PyDev is installed via the Eclipse "dropins"
-directory.
+2.1.1:
+
+ -
+ Python debugging now works when PyDev is installed via the Eclipse "dropins" directory.
+
+ -
+ Fixed a bug in the check that prevents Ghidra projects from being created within the Ghidra
+ installation directory.
+
+
2.1.0:
-
diff --git a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/ghidraprojectcreator/wizards/CreateGhidraModuleProjectWizard.java b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/ghidraprojectcreator/wizards/CreateGhidraModuleProjectWizard.java
index 59837c7bca..abbf1b23a8 100644
--- a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/ghidraprojectcreator/wizards/CreateGhidraModuleProjectWizard.java
+++ b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/ghidraprojectcreator/wizards/CreateGhidraModuleProjectWizard.java
@@ -37,6 +37,7 @@ import ghidradev.EclipseMessageUtils;
import ghidradev.ghidraprojectcreator.utils.GhidraModuleUtils;
import ghidradev.ghidraprojectcreator.utils.GhidraModuleUtils.ModuleTemplateType;
import ghidradev.ghidraprojectcreator.wizards.pages.*;
+import utilities.util.FileUtilities;
/**
* Wizard to create a new Ghidra module project.
@@ -160,10 +161,10 @@ public class CreateGhidraModuleProjectWizard extends Wizard implements INewWizar
* @return True if the data returned from the wizard pages are valid; otherwise, false
*/
private boolean validate() {
- if (projectPage.getProjectDir().getAbsolutePath().startsWith(
- ghidraInstallationPage.getGhidraInstallDir().getAbsolutePath())) {
+ if (FileUtilities.isPathContainedWithin(ghidraInstallationPage.getGhidraInstallDir(),
+ projectPage.getProjectDir())) {
EclipseMessageUtils.showErrorDialog("Invalid Project Root Directory",
- "Project root directory cannot reside inside of the selected Ghidra installation directory.");
+ "Project root directory cannot reside inside of the selected Ghidra installation directory.");
return false;
}
return true;