1 files changed, 33 insertions, 4 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/FinalProjectConfigurationPage.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/FinalProjectConfigurationPage.cs
index 0b6956b18b..c903c47c92 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/FinalProjectConfigurationPage.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/FinalProjectConfigurationPage.cs
@@ -40,6 +40,10 @@ namespace MonoDevelop.Ide.Projects
 		SolutionTemplate template;
 		bool valid;
 		bool projectNameIsReadOnly;
+		bool? createProjectDirectoryInsideSolutionDirectory;
+		bool createProjectDirectoryInsideSolutionDirectoryEnabled = true;
+		bool? createGitIgnoreFile;
+		bool gitIgnoreEnabled = true;
 
 		public FinalProjectConfigurationPage (NewProjectConfiguration config)
 		{
@@ -138,7 +142,12 @@ namespace MonoDevelop.Ide.Projects
 		}
 
 		public bool CreateGitIgnoreFile {
-			get { return config.CreateGitIgnoreFile; }
+			get {
+				if (createGitIgnoreFile.HasValue) {
+					return createGitIgnoreFile.Value;
+				}
+				return config.CreateGitIgnoreFile;
+			}
 			set { config.CreateGitIgnoreFile = value; }
 		}
 
@@ -148,7 +157,12 @@ namespace MonoDevelop.Ide.Projects
 		}
 
 		public bool CreateProjectDirectoryInsideSolutionDirectory {
-			get { return config.CreateProjectDirectoryInsideSolutionDirectory; }
+			get {
+				if (createProjectDirectoryInsideSolutionDirectory.HasValue) {
+					return createProjectDirectoryInsideSolutionDirectory.Value;
+				}
+				return config.CreateProjectDirectoryInsideSolutionDirectory;
+			}
 			set { config.CreateProjectDirectoryInsideSolutionDirectory = value; }
 		}
 
@@ -161,11 +175,11 @@ namespace MonoDevelop.Ide.Projects
 		}
 
 		public bool IsCreateProjectDirectoryInsideSolutionDirectoryEnabled {
-			get { return HasProjects && IsNewSolution; }
+			get { return HasProjects && IsNewSolution && createProjectDirectoryInsideSolutionDirectoryEnabled; }
 		}
 
 		public bool IsGitIgnoreEnabled {
-			get { return config.UseGit && IsUseGitEnabled; }
+			get { return config.UseGit && IsUseGitEnabled && gitIgnoreEnabled; }
 		}
 
 		public bool IsUseGitEnabled { get; set; }
@@ -230,6 +244,21 @@ namespace MonoDevelop.Ide.Projects
 		{
 			ProjectName = Parameters ["ProjectName"];
 			projectNameIsReadOnly = Parameters.GetBoolValue ("IsProjectNameReadOnly", false);
+
+			createProjectDirectoryInsideSolutionDirectory = GetParameterValue ("CreateProjectDirectoryInsideSolutionDirectory");
+			createProjectDirectoryInsideSolutionDirectoryEnabled = Parameters. GetBoolValue ("IsCreateProjectDirectoryInsideSolutionDirectoryEnabled", true);
+
+			createGitIgnoreFile = GetParameterValue ("CreateGitIgnoreFile");
+			gitIgnoreEnabled = Parameters.GetBoolValue ("IsGitIgnoreEnabled", true);
+		}
+
+		bool? GetParameterValue (string name)
+		{
+			string value = Parameters [name];
+			if (!string.IsNullOrEmpty (value)) {
+				return Parameters.GetBoolValue (name);
+			}
+			return null;
 		}
 	}
 }