Merge pull request yysun#113 from sharwell/fix-112

Handle exception thrown when the diff margin is updating when the editor...
mjtworks · Dec 21, 2013 · b432010 · b432010
2 parents c40dedc + 3672318
commit b432010
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/Diff/ViewModel/DiffMarginViewModel.cs b/Diff/ViewModel/DiffMarginViewModel.cs
@@ -123,7 +123,15 @@ private void MoveToChange(DiffViewModel currentDiffViewModel, int indexModifier)
 
         private void RefreshDiffViewModelPositions()
         {
-            RefreshDiffViewModelPositions(false, null);
+            try
+            {
+                RefreshDiffViewModelPositions(false, null);
+            }
+            catch (Exception ex)
+            {
+                if (ErrorHandler.IsCriticalException(ex))
+                    throw;
+            }
         }
 
         private void RefreshDiffViewModelPositions(bool approximate, TextViewLayoutChangedEventArgs e)