Merge branch 'fixes/changes-view-reload' into enhancements/changes-tree-view-rollup

Author: StanleyGoldman

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

@@ -18,7 +18,7 @@ class ChangesView : Subview
         private const string NoChangedFilesLabel = "No changed files";
 
         [NonSerialized] private bool currentBranchHasUpdate;
-        [NonSerialized] private bool currentStatusHasUpdate;
+        [NonSerialized] private bool currentStatusEntriesHasUpdate;
         [NonSerialized] private bool isBusy;
 
         [SerializeField] private string commitBody = "";
@@ -40,11 +40,8 @@ public override void OnEnable()
             base.OnEnable();
             AttachHandlers(Repository);
 
-            if (Repository != null)
-            {
-                Repository.CheckCurrentBranchChangedEvent(lastCurrentBranchChangedEvent);
-                Repository.CheckStatusEntriesChangedEvent(lastStatusEntriesChangedEvent);
-            }
+            Repository.CheckCurrentBranchChangedEvent(lastCurrentBranchChangedEvent);
+            Repository.CheckStatusEntriesChangedEvent(lastStatusEntriesChangedEvent);
         }
 
         public override void OnDisable()
@@ -108,7 +105,7 @@ private void RepositoryOnStatusEntriesChanged(CacheUpdateEvent cacheUpdateEvent)
             if (!lastStatusEntriesChangedEvent.Equals(cacheUpdateEvent))
             {
                 lastStatusEntriesChangedEvent = cacheUpdateEvent;
-                currentStatusHasUpdate = true;
+                currentStatusEntriesHasUpdate = true;
                 Redraw();
             }
         }
@@ -153,9 +150,9 @@ private void MaybeUpdateData()
                 currentBranch = string.Format("[{0}]", Repository.CurrentBranchName);
             }
 
-            if (currentStatusHasUpdate)
+            if (currentStatusEntriesHasUpdate)
             {
-                currentStatusHasUpdate = false;
+                currentStatusEntriesHasUpdate = false;
                 var entries = Repository.CurrentChanges;
                 tree.UpdateEntries(entries.Where(x => x.Status != GitFileStatus.Ignored).ToList());
             }