Merge pull request #70 from Jamesmallon1/patch-1

Update GestureFrameRenderer.cs
robinmanuelthiel · Feb 27, 2019 · 75125bd · 75125bd
2 parents 7cd38d7 + 3ee8c40
commit 75125bd
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/Flex.UWP/CutomRenderers/GestureFrameRenderer.cs b/Flex.UWP/CutomRenderers/GestureFrameRenderer.cs
@@ -31,18 +31,18 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
 
         }
 
-        protected override void OnElementChanged(ElementChangedEventArgs<Xamarin.Forms.Frame> e)
-        {
+        protected override void OnElementChanged(ElementChangedEventArgs<Xamarin.Forms.Frame> e)
+        {
             base.OnElementChanged(e);
 
             if (e.OldElement == null)
             {
                 FixFormsBackgroundColor(e.NewElement);
 
-                if (!e.NewElement.GestureRecognizers.Any())
-                    return;
-
-                if (!e.NewElement.GestureRecognizers.Any(x => x.GetType() == typeof(TouchGestureRecognizer)))
+                if (!e.NewElement.GestureRecognizers.Any())
+                    return;
+
+                if (!e.NewElement.GestureRecognizers.Any(x => x.GetType() == typeof(TouchGestureRecognizer)))
                     return;
 
                 Control.PointerPressed += Control_PointerPressed;
@@ -54,7 +54,7 @@ protected override void OnElementChanged(ElementChangedEventArgs<Xamarin.Forms.F
                 // Fix Xamarin.Forms Frame Bugs on UWP
                 Control.SizeChanged += (s, a) => FixFormsBackgroundColor(Element);
                 Control.CornerRadius = new Windows.UI.Xaml.CornerRadius(Element.CornerRadius);
-            }
+            } 
         }
 
         /// <summary>
@@ -84,6 +84,9 @@ private void FixFormsBackgroundColor(Xamarin.Forms.Frame frame)
 
         private void Control_PointerPressed(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs e)
         {
+            if(Element == null)
+                return;
+
             pressed = true;
 
             foreach (var recognizer in Element.GestureRecognizers.Where(x => x.GetType() == typeof(TouchGestureRecognizer)))
@@ -97,6 +100,9 @@ private void Control_PointerPressed(object sender, Windows.UI.Xaml.Input.Pointer
 
         private void Control_PointerReleased(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs e)
         {
+            if(Element == null)
+                return;
+
             foreach (var recognizer in Element.GestureRecognizers.Where(x => x.GetType() == typeof(TouchGestureRecognizer)))
             {
                 if (recognizer is TouchGestureRecognizer touchGestureRecognizer)