Rename UpdateSubmodulesStatus -> UpdateSubmodulesStructure

gitextensions · Nov 15, 2018 · e260afa · e260afa
1 parent 4a9dc25
commit e260afa
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/GitUI/CommandsDialogs/FormBrowse.cs b/GitUI/CommandsDialogs/FormBrowse.cs
@@ -256,7 +256,7 @@ public FormBrowse([NotNull] GitUICommands commands, string filter, ObjectId sele
 
                     if (AppSettings.ShowSubmoduleStatus && _submoduleStatusProvider.HasSubmodulesStatusChanged(status))
                     {
-                        UpdateSubmodulesStatus(updateStatus: true);
+                        UpdateSubmodulesStructure(updateStatus: true);
                     }
                 };
 
@@ -466,7 +466,6 @@ protected override void OnLoad(EventArgs e)
                                 : Images.ReloadRevisions;
                         })
                     .FileAndForget();
-                UpdateStashCount();
             };
 
             base.OnLoad(e);
@@ -533,7 +532,8 @@ public override void CancelButtonClick(object sender, EventArgs e)
         private void UICommands_PostRepositoryChanged(object sender, GitUIEventArgs e)
         {
             this.InvokeAsync(RefreshRevisions).FileAndForget();
-            UpdateSubmodulesStatus();
+            UpdateSubmodulesStructure();
+            UpdateStashCount();
         }
 
         private void RefreshRevisions()
@@ -1000,8 +1000,6 @@ void CheckForMergeConflicts()
 
         private void UpdateStashCount()
         {
-            ThreadHelper.ThrowIfNotOnUIThread();
-
             if (AppSettings.ShowStashCount)
             {
                 ThreadHelper.JoinableTaskFactory.RunAsync(async () =>
@@ -1278,14 +1276,14 @@ private void PushToolStripMenuItemClick(object sender, EventArgs e)
         private void RefreshStatus()
         {
             _gitStatusMonitor?.RequestRefresh();
-            UpdateSubmodulesStatus();
+            UpdateSubmodulesStructure();
             UpdateStashCount();
         }
 
         private void RefreshToolStripMenuItemClick(object sender, EventArgs e)
         {
-            RefreshStatus();
             RefreshRevisions();
+            RefreshStatus();
         }
 
         private void RefreshDashboardToolStripMenuItemClick(object sender, EventArgs e)
@@ -1569,7 +1567,7 @@ private void ToolStripButtonPushClick(object sender, EventArgs e)
         private void ManageSubmodulesToolStripMenuItemClick(object sender, EventArgs e)
         {
             UICommands.StartSubmodulesDialog(this);
-            UpdateSubmodulesStatus();
+            UpdateSubmodulesStructure();
         }
 
         private void UpdateSubmoduleToolStripMenuItemClick(object sender, EventArgs e)
@@ -1586,13 +1584,13 @@ private void UpdateSubmoduleToolStripMenuItemClick(object sender, EventArgs e)
         private void UpdateAllSubmodulesToolStripMenuItemClick(object sender, EventArgs e)
         {
             UICommands.StartUpdateSubmodulesDialog(this);
-            UpdateSubmodulesStatus();
+            UpdateSubmodulesStructure();
         }
 
         private void SynchronizeAllSubmodulesToolStripMenuItemClick(object sender, EventArgs e)
         {
             UICommands.StartSyncSubmodulesDialog(this);
-            UpdateSubmodulesStatus();
+            UpdateSubmodulesStructure();
         }
 
         private void ToolStripSplitStashButtonClick(object sender, EventArgs e)
@@ -2606,7 +2604,7 @@ Image GetSubmoduleItemImage(DetailedSubmoduleInfo details)
             }
         }
 
-        private void UpdateSubmodulesStatus(bool updateStatus = false)
+        private void UpdateSubmodulesStructure(bool updateStatus = false)
         {
             toolStripButtonLevelUp.ToolTipText = "";
             _submoduleStatusProvider.UpdateSubmodulesStatus(