Merge pull request #47 from github-for-unity/fixes/unlock-context-menu

Fix to properly assess if file is locked/unlocked in context menu
github-for-unity · Jun 28, 2017 · b9289f4 · b9289f4
2 parents 0c83f0a + 1076e8a
commit b9289f4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs
@@ -52,13 +52,13 @@ private static bool ContextMenu_CanLock()
 
             var alreadyLocked = locks.Any(x =>
             {
-                return repositoryPath == x.Path;
+                return repositoryPath == x.Path.ToNPath();
 
             });
             GitFileStatus status = GitFileStatus.None;
             if (entries != null)
             {
-                status = entries.FirstOrDefault(x => repositoryPath == x.Path).Status;
+                status = entries.FirstOrDefault(x => repositoryPath == x.Path.ToNPath()).Status;
             }
             return !alreadyLocked && status != GitFileStatus.Untracked && status != GitFileStatus.Ignored;
         }
@@ -100,7 +100,7 @@ private static bool ContextMenu_CanUnlock()
             NPath assetPath = AssetDatabase.GetAssetPath(selected.GetInstanceID()).ToNPath();
             NPath repositoryPath = EntryPoint.Environment.GetRepositoryPath(assetPath);
 
-            var isLocked = locks.Any(x => repositoryPath == x.Path);
+            var isLocked = locks.Any(x => repositoryPath == x.Path.ToNPath());
             return isLocked;
         }