Fixed Settings file path

simeonradivoev · Sep 14, 2019 · ff09afd · ff09afd
1 parent 562a6b3
commit ff09afd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/Assets/Plugins/UniGit/Editor/GitSettingsManager.cs b/Assets/Plugins/UniGit/Editor/GitSettingsManager.cs
@@ -13,14 +13,12 @@ public class GitSettingsManager : IDisposable
 		private readonly GitCallbacks gitCallbacks;
 		private readonly ILogger logger;
 		private readonly GitInitializer initializer;
-		private readonly GitManager gitManager;
 		private readonly UniGitPaths paths;
 
 		[UniGitInject]
-		public GitSettingsManager(UniGitPaths paths, GitSettingsJson settings,GitCallbacks gitCallbacks,ILogger logger,GitInitializer initializer, GitManager gitManager)
+		public GitSettingsManager(UniGitPaths paths, GitSettingsJson settings,GitCallbacks gitCallbacks,ILogger logger,GitInitializer initializer)
 		{
 			this.paths = paths;
-			this.gitManager = gitManager;
 			this.settings = settings;
 			this.gitCallbacks = gitCallbacks;
 			this.logger = logger;
@@ -75,8 +73,9 @@ public void LoadOldSettingsFile()
 			{
 				settings.Copy(oldSettingsFile);
 				logger.Log(LogType.Log,"Old Git Settings transferred to new json settings file. Old settings can now safely be removed.");
-			}
-			SaveSettingsToFile();
+
+				SaveSettingsToFile();
+            }
 		}
 
 		public void ShowChooseMainRepositoryPathPopup(EditorWindow context = null)

diff --git a/Assets/Plugins/UniGit/Editor/Utils/UniGitPaths.cs b/Assets/Plugins/UniGit/Editor/Utils/UniGitPaths.cs
@@ -29,7 +29,7 @@ public void SetRepoPath(string repoPath)
 			this.RepoPath = repoPath;
 
 			SettingsFolderPath = UniGitPathHelper.Combine(repoPath, ".git", "UniGit");
-            SettingsFilePath = UniGitPathHelper.Combine(SettingsFilePath, "Settings.json");
+            SettingsFilePath = UniGitPathHelper.Combine(SettingsFolderPath, "Settings.json");
             LogsFolderPath = SettingsFolderPath;
             LogsFilePath = UniGitPathHelper.Combine(LogsFolderPath, "log.txt");
             CredentialsFilePath = UniGitPathHelper.Combine(SettingsFolderPath, "Credentials.json");