Dropped PPC Job Additional Tools.

1 files changed, 16 insertions, 12 deletions

diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchVirtualizedContentControl.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchVirtualizedContentControl.cs
index 72bb7dd06..bb9f260c0 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchVirtualizedContentControl.cs
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchVirtualizedContentControl.cs
@@ -128,26 +128,30 @@ namespace Tango.Touch.Controls
 
             Rect bounds = new Rect(_location.X, _location.Y, ActualWidth, ActualHeight);
             Rect rect = new Rect(0.0, _scrollViewer.GetScrollPosition(), _border_viewport.ActualWidth, _border_viewport.ActualHeight);
-            if (bounds.IntersectsWith(rect))
+
+            if (_innerBorder != null)
             {
-                if (_innerBorder.Visibility == Visibility.Hidden)
+                if (bounds.IntersectsWith(rect))
                 {
-                    //Debug.WriteLine("Visible");
-                    Dispatcher.BeginInvoke(new Action(() =>
+                    if (_innerBorder.Visibility == Visibility.Hidden)
                     {
-                        _innerBorder.Visibility = Visibility.Visible;
-                    }), DispatcherPriority.Background);
+                        //Debug.WriteLine("Visible");
+                        Dispatcher.BeginInvoke(new Action(() =>
+                        {
+                            _innerBorder.Visibility = Visibility.Visible;
+                        }), DispatcherPriority.Background);
+                    }
                 }
-            }
-            else
-            {
-                if (_innerBorder.Visibility == Visibility.Visible)
+                else
                 {
-                    Dispatcher.BeginInvoke(new Action(() =>
+                    if (_innerBorder.Visibility == Visibility.Visible)
                     {
+                        Dispatcher.BeginInvoke(new Action(() =>
+                        {
                         //Debug.WriteLine("Hidden");
                         _innerBorder.Visibility = Visibility.Hidden;
-                    }), DispatcherPriority.Background);
+                        }), DispatcherPriority.Background);
+                    }
                 }
             }
         }