Disable sinks for each loaded component.

Author: Hosch250

RetailCoder.VBE/App.cs

@@ -74,8 +74,8 @@ public App(VBE vbe, IMessageBox messageBox,
             _panelVM.OpenRepoStarted += DisableSinkEventHandlers;
             _panelVM.OpenRepoCompleted += EnableSinkEventHandlersAndUpdateCache;
 
-            _branchesVM.MergeStarted += DisableSinkEventHandlers;
-            _branchesVM.MergeCompleted += EnableSinkEventHandlersAndUpdateCache;
+            _branchesVM.LoadingComponentsStarted += DisableSinkEventHandlers;
+            _branchesVM.LoadingComponentsCompleted += EnableSinkEventHandlersAndUpdateCache;
 
             _hooks.MessageReceived += _hooks_MessageReceived;
             _configService.SettingsChanged += _configService_SettingsChanged;
@@ -458,8 +458,8 @@ public void Dispose()
 
             if (_branchesVM != null)
             {
-                _branchesVM.MergeStarted -= DisableSinkEventHandlers;
-                _branchesVM.MergeCompleted -= EnableSinkEventHandlersAndUpdateCache;
+                _branchesVM.LoadingComponentsStarted -= DisableSinkEventHandlers;
+                _branchesVM.LoadingComponentsCompleted -= EnableSinkEventHandlersAndUpdateCache;
             }
 
             if (_hooks != null)

RetailCoder.VBE/UI/SourceControl/BranchesViewViewModel.cs

@@ -107,12 +107,14 @@ public string CurrentBranch
 
                     try
                     {
+                        OnLoadingComponentsStarted();
                         Provider.Checkout(_currentBranch);
                     }
                     catch (SourceControlException ex)
                     {
                         RaiseErrorEvent(ex.Message, ex.InnerException.Message, NotificationType.Error);
                     }
+                    OnLoadingComponentsCompleted();
                 }
             }
         }
@@ -279,7 +281,7 @@ private void CreateBranchCancel()
 
         private void MergeBranchOk()
         {
-            OnMergeStarted();
+            OnLoadingComponentsStarted();
 
             try
             {
@@ -288,13 +290,13 @@ private void MergeBranchOk()
             catch (SourceControlException ex)
             {
                 RaiseErrorEvent(ex.Message, ex.InnerException.Message, NotificationType.Error);
-                OnMergeCompleted();
+                OnLoadingComponentsCompleted();
                 return;
             }
 
             DisplayMergeBranchesGrid = false;
             RaiseErrorEvent(RubberduckUI.SourceControl_MergeStatus, string.Format(RubberduckUI.SourceControl_SuccessfulMerge, SourceBranch, DestinationBranch), NotificationType.Info);
-            OnMergeCompleted();
+            OnLoadingComponentsCompleted();
         }
 
         private void MergeBranchCancel()
@@ -429,20 +431,20 @@ private void RaiseErrorEvent(string message, string innerMessage, NotificationTy
             }
         }
 
-        public event EventHandler<EventArgs> MergeStarted;
-        private void OnMergeStarted()
+        public event EventHandler<EventArgs> LoadingComponentsStarted;
+        private void OnLoadingComponentsStarted()
         {
-            var handler = MergeStarted;
+            var handler = LoadingComponentsStarted;
             if (handler != null)
             {
                 handler(this, EventArgs.Empty);
             }
         }
 
-        public event EventHandler<EventArgs> MergeCompleted;
-        private void OnMergeCompleted()
+        public event EventHandler<EventArgs> LoadingComponentsCompleted;
+        private void OnLoadingComponentsCompleted()
         {
-            var handler = MergeCompleted;
+            var handler = LoadingComponentsCompleted;
             if (handler != null)
             {
                 handler(this, EventArgs.Empty);