Fix stack overflow in RefactorCommandBase.CanExecute

rubberduck-vba · Mar 18, 2019 · 650d119 · 650d119
1 parent 319dba6
commit 650d119
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Rubberduck.Core/UI/Command/NoIndentAnnotationCommand.cs b/Rubberduck.Core/UI/Command/NoIndentAnnotationCommand.cs
@@ -26,8 +26,10 @@ protected override bool EvaluateCanExecute(object parameter)
             var target = FindTarget(parameter);
             using (var pane = _vbe.ActiveCodePane)
             {
-                return !pane.IsWrappingNullReference && target != null &&
-                       target.Annotations.All(a => a.AnnotationType != AnnotationType.NoIndent);
+                return pane != null 
+                       && !pane.IsWrappingNullReference 
+                       && target != null 
+                       && target.Annotations.All(a => a.AnnotationType != AnnotationType.NoIndent);
             }
         }
 

diff --git a/Rubberduck.Core/UI/Command/Refactorings/RefactorCommandBase.cs b/Rubberduck.Core/UI/Command/Refactorings/RefactorCommandBase.cs
@@ -27,7 +27,8 @@ protected void AddToCanExecuteEvaluation(Func<object, bool> furtherCanExecuteEva
                 return;
             }
 
-            CanExecuteEvaluation = (parameter) => CanExecuteEvaluation(parameter) && furtherCanExecuteEvaluation(parameter);
+            var currentCanExecute = CanExecuteEvaluation; 
+            CanExecuteEvaluation = (parameter) => currentCanExecute(parameter) && furtherCanExecuteEvaluation(parameter);
         }
 
         protected override bool EvaluateCanExecute(object parameter)