Merge pull request #1019 from Mr1Penguin/check-back-button-handled

Check for e.Handled inside PrismApplication.OnGoBackRequested
PrismLibrary · Apr 16, 2017 · 68f784d · 68f784d
2 parents ba037e1 + 27f218b
commit 68f784d
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/Source/Windows10/Prism.Windows/PrismApplication.cs b/Source/Windows10/Prism.Windows/PrismApplication.cs
@@ -434,14 +434,17 @@ private void OnGoForwardRequested(object sender, DeviceGestureEventArgs e)
         /// <param name="e"></param>
         private void OnGoBackRequested(object sender, DeviceGestureEventArgs e)
         {
-            if (NavigationService.CanGoBack())
+            if (!e.Handled)
             {
-                NavigationService.GoBack();
-                e.Handled = true;
-            }
-            else if (DeviceGestureService.IsHardwareBackButtonPresent && e.IsHardwareButton)
-            {
-                Exit();
+                if (NavigationService.CanGoBack())
+                {
+                    NavigationService.GoBack();
+                    e.Handled = true;
+                }
+                else if (DeviceGestureService.IsHardwareBackButtonPresent && e.IsHardwareButton)
+                {
+                    Exit();
+                }
             }
         }