Merge pull request #8062 from mono/backport-pr-8061-to-release-8.2

[release-8.2] Fixes VSTS Bug 938343: [Feedback] Diff Option in Version Control not

1 files changed, 17 insertions, 11 deletions

diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs
index 5032fbd507..db1b4688fd 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs
@@ -128,17 +128,23 @@ namespace MonoDevelop.VersionControl.Views
 		
 		protected override void OnUnfocused ()
 		{
-			var textView = info.Controller.GetContent <ITextView> ();
-			if (textView != null) {
-				var pos = ComparisonWidget.OriginalEditor.Caret.Offset;
-				var snapshot = textView.TextSnapshot;
-				var point = new SnapshotPoint (snapshot, Math.Max (0, Math.Min (snapshot.Length - 1, pos)));
-				textView.Caret.MoveTo (point);
-
-				int line = GetLineInCenter (ComparisonWidget.OriginalEditor);
-				line = Math.Min (line, snapshot.LineCount);
-				var middleLine = snapshot.GetLineFromLineNumber (line);
-				textView.ViewScroller.EnsureSpanVisible (new SnapshotSpan (textView.TextSnapshot, middleLine.Start, 0), EnsureSpanVisibleOptions.AlwaysCenter);
+			try {
+				var textView = info.Controller.GetContent<ITextView> ();
+				if (textView != null) {
+					if (textView.IsClosed)
+						return;
+					var pos = ComparisonWidget.OriginalEditor.Caret.Offset;
+					var snapshot = textView.TextSnapshot;
+					var point = new SnapshotPoint (snapshot, Math.Max (0, Math.Min (snapshot.Length - 1, pos)));
+					textView.Caret.MoveTo (point);
+
+					int line = GetLineInCenter (ComparisonWidget.OriginalEditor);
+					line = Math.Min (line, snapshot.LineCount);
+					var middleLine = snapshot.GetLineFromLineNumber (line);
+					textView.ViewScroller.EnsureSpanVisible (new SnapshotSpan (textView.TextSnapshot, middleLine.Start, 0), EnsureSpanVisibleOptions.AlwaysCenter);
+				}
+			} catch (Exception e) {
+				LoggingService.LogInternalError (e);
 			}
 		}