Merge pull request #937 from github-for-unity/refrsh-asset-database

Refreshing the asset database differently
github-for-unity · Oct 10, 2018 · 1c53148 · 1c53148
2 parents 1ccda46 + 7e44c95
commit 1c53148
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs
@@ -514,6 +514,7 @@ private void SwitchBranch(string branch)
                         {
                             UsageTracker.IncrementBranchesViewButtonCheckoutLocalBranch();
                             Redraw();
+                            AssetDatabase.Refresh();
                         }
                         else
                         {

diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs
@@ -67,7 +67,6 @@ private static void RepositoryOnStatusEntriesChanged(CacheUpdateEvent cacheUpdat
             if (!lastRepositoryStatusChangedEvent.Equals(cacheUpdateEvent))
             {
                 lastRepositoryStatusChangedEvent = cacheUpdateEvent;
-                AssetDatabase.Refresh();
                 entries.Clear();
                 entries.AddRange(Repository.CurrentChanges);
                 OnStatusUpdate();

diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs
@@ -757,6 +757,8 @@ private void Pull()
                             EditorUtility.DisplayDialog(Localization.PullActionTitle,
                                 String.Format(Localization.PullSuccessDescription, currentRemoteName),
                             Localization.Ok);
+
+                            AssetDatabase.Refresh();
                         }
                         else
                         {
-Original file line number
+Diff line change
@@ Expand Up / @@ -514,6 +514,7 @@ private void SwitchBranch(string branch) @@
                             {
                                 UsageTracker.IncrementBranchesViewButtonCheckoutLocalBranch();
                                 Redraw();
+                                AssetDatabase.Refresh();
                             }
                             else
                             {
@@ Expand Down @@