Updating branches after enabled

Author: StanleyGoldman

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs

@@ -44,6 +44,7 @@ class BranchesView : Subview
         [NonSerialized] private BranchTreeNode newNodeSelection;
         [NonSerialized] private BranchesMode targetMode;
         [NonSerialized] private bool favoritesHasChanged;
+        [NonSerialized] private bool branchesHasChanged;
 
         [SerializeField] private BranchTreeNode activeBranchNode;
         [SerializeField] private BranchTreeNode localRoot;
@@ -65,6 +66,7 @@ public override void OnEnable()
             base.OnEnable();
             AttachHandlers(Repository);
             favoritesHasChanged = true;
+            branchesHasChanged = true;
         }
 
         public override void OnDisable()
@@ -86,6 +88,12 @@ private void MaybeUpdateData()
                 favoritesList = Manager.LocalSettings.Get(FavoritesSetting, new List<string>());
                 favoritesHasChanged = false;
             }
+
+            if (branchesHasChanged)
+            {
+                RunRefreshEmbeddedOnMainThread();
+                branchesHasChanged = false;
+            }
         }
 
         public override void OnRepositoryChanged(IRepository oldRepository)
@@ -114,22 +122,15 @@ private void DetachHandlers(IRepository repository)
             repository.OnCurrentRemoteChanged -= HandleRepositoryBranchChangeEvent;
         }
 
-        private void RunRefreshEmbeddedOnMainThread()
-        {
-            new ActionTask(TaskManager.Token, _ => RefreshEmbedded())
-                .ScheduleUI(TaskManager);
-        }
-
         private void HandleRepositoryBranchChangeEvent(string obj)
         {
             RunRefreshEmbeddedOnMainThread();
         }
 
-        public override void Refresh()
+        private void RunRefreshEmbeddedOnMainThread()
         {
-            base.Refresh();
-
-            RefreshEmbedded();
+            new ActionTask(TaskManager.Token, _ => RefreshEmbedded())
+                .ScheduleUI(TaskManager);
         }
 
         public void RefreshEmbedded()
@@ -297,9 +298,9 @@ private void OnLocalBranchesUpdate(IEnumerable<GitBranch> list)
             newLocalBranches = new List<GitBranch>(list);
         }
 
-        private void OnRemoteBranchesUpdate(IEnumerable<GitBranch> list)
+        private void OnRemoteBranchesUpdate(IEnumerable<GitBranch> newRemoteBranches)
         {
-            BuildTree(newLocalBranches, list);
+            BuildTree(newLocalBranches, newRemoteBranches);
             newLocalBranches.Clear();
         }