Prevent Crash on Rapid Back/Forward Press

Author: lukeblevins

Files UWP/Filesystem/ItemViewModel.cs

@@ -356,10 +356,12 @@ public async void AddItemsToCollectionAsync(string path, Page currentPage)
                 {
                     if (typeof(PageType) == typeof(GenericFileBrowser))
                     {
+                        if (_cancellationTokenSource.IsCancellationRequested) { return; }
                         (tabInstance.accessibleContentFrame.Content as GenericFileBrowser).TextState.isVisible = Visibility.Visible;
                     }
                     else if (typeof(PageType) == typeof(PhotoAlbum))
                     {
+                        if (_cancellationTokenSource.IsCancellationRequested) { return; }
                         (tabInstance.accessibleContentFrame.Content as PhotoAlbum).TextState.isVisible = Visibility.Visible;
                     }
                 }
@@ -399,10 +401,12 @@ public async void AddItemsToCollectionAsync(string path, Page currentPage)
 
             if (typeof(PageType) == typeof(GenericFileBrowser))
             {
+                if (_cancellationTokenSource.IsCancellationRequested) { return; }
                 (tabInstance.accessibleContentFrame.Content as GenericFileBrowser).progressBar.Visibility = Visibility.Collapsed;
             }
             else if (typeof(PageType) == typeof(PhotoAlbum))
             {
+                if (_cancellationTokenSource.IsCancellationRequested) { return; }
                 (tabInstance.accessibleContentFrame.Content as PhotoAlbum).progressBar.Visibility = Visibility.Collapsed;
             }
         }

Files UWP/ProHome.xaml.cs

@@ -922,7 +922,7 @@ public async void ShowPropertiesButton_Click(object sender, RoutedEventArgs e)
             {
                 propertiesFrame.Navigate(typeof(Properties), (ItemViewModel<ProHome>.GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum).gv.SelectedItems, new SuppressNavigationTransitionInfo());
             }
-            await PropertiesDialog.ShowAsync();
+            await PropertiesDialog.ShowAsync(ContentDialogPlacement.Popup);
         }
 
         public void PropertiesWindow_CancelButton_Click(object sender, RoutedEventArgs e)

Files UWP/Properties.xaml

@@ -50,7 +50,7 @@
         </StackPanel>
 
         <StackPanel Spacing="5" Padding="0,10" Orientation="Horizontal" Grid.Row="1" HorizontalAlignment="Center">
-            <Button Content="OK" Foreground="White" Background="#FF0078D7" CornerRadius="2" Width="128" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/>
+            <Button Content="OK" Foreground="White" Background="#FF0078D7" CornerRadius="2" Width="128" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Click="Button_Click"/>
             <Button Content="Apply" CornerRadius="2" Width="128" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/>
             <Button Content="Cancel" CornerRadius="2" Width="128" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/>
         </StackPanel>

Files UWP/Properties.xaml.cs

@@ -34,5 +34,10 @@ private void Apply_Button_Click(object sender, RoutedEventArgs e)
         {
 
         }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
     }
 }