From 69e2c459c4ce70d182357b4a0b540f3cdb7d526b Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 16 Jun 2016 00:23:08 +0200
Subject: [PATCH] Do a null Items check in ScrollIntoView

This can happen when bindings are in the process of updating, or if the
client calls SelectingItemsControl.ScrollIntoView themselves.
---
 .../Presenters/ItemVirtualizerNone.cs               | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Controls/Presenters/ItemVirtualizerNone.cs b/src/Avalonia.Controls/Presenters/ItemVirtualizerNone.cs
index 56bb9299ae..411f309368 100644
--- a/src/Avalonia.Controls/Presenters/ItemVirtualizerNone.cs
+++ b/src/Avalonia.Controls/Presenters/ItemVirtualizerNone.cs
@@ -116,12 +116,15 @@ namespace Avalonia.Controls.Presenters
         /// <param name="item">The item.</param>
         public override void ScrollIntoView(object item)
         {
-            var index = Items.IndexOf(item);
-
-            if (index != -1)
+            if (Items != null)
             {
-                var container = Owner.ItemContainerGenerator.ContainerFromIndex(index);
-                container.BringIntoView();
+                var index = Items.IndexOf(item);
+
+                if (index != -1)
+                {
+                    var container = Owner.ItemContainerGenerator.ContainerFromIndex(index);
+                    container.BringIntoView();
+                }
             }
         }