Added safeguards for edge cases

goran-w · goran-w · commit 03f5cb8eb04a · 2024-11-29T13:28:58.000+01:00
diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
@@ -1146,6 +1146,8 @@ public class SingleSideTextDiffPresenter : ThemedTextDiffPresenter
 
         public void ForceSyncScrollOffset()
         {
+            if (_scrollViewer == null)
+                return;
             if (DataContext is ViewModels.TwoSideTextDiff diff)
                 diff.SyncScrollOffset = _scrollViewer?.Offset ?? Vector.Zero;
         }
@@ -1585,7 +1587,7 @@ static TextDiffView()
 
             CurrentChangeBlockIdxProperty.Changed.AddClassHandler<TextDiffView>((v, e) =>
             {
-                if (v.Editor.Presenter != null)
+                if ((int)e.NewValue >= 0 && v.Editor.Presenter != null)
                 {
                     foreach (var p in v.Editor.Presenter.GetVisualDescendants().OfType<ThemedTextDiffPresenter>())
                     {

Original file line number	Diff line number	Diff line change
`@@ -1146,6 +1146,8 @@ public class SingleSideTextDiffPresenter : ThemedTextDiffPresenter`
`1146`	`1146`
`1147`	`1147`	`public void ForceSyncScrollOffset()`
`1148`	`1148`	`{`
	`1149`	`+ if (_scrollViewer == null)`
	`1150`	`+ return;`
`1149`	`1151`	`if (DataContext is ViewModels.TwoSideTextDiff diff)`
`1150`	`1152`	`diff.SyncScrollOffset = _scrollViewer?.Offset ?? Vector.Zero;`
`1151`	`1153`	`}`
`@@ -1585,7 +1587,7 @@ static TextDiffView()`
`1585`	`1587`
`1586`	`1588`	`CurrentChangeBlockIdxProperty.Changed.AddClassHandler<TextDiffView>((v, e) =>`
`1587`	`1589`	`{`
`1588`		`- if (v.Editor.Presenter != null)`
	`1590`	`+ if ((int)e.NewValue >= 0 && v.Editor.Presenter != null)`
`1589`	`1591`	`{`
`1590`	`1592`	`foreach (var p in v.Editor.Presenter.GetVisualDescendants().OfType<ThemedTextDiffPresenter>())`
`1591`	`1593`	`{`