@@ -161,10 +161,10 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
161
161
162
162
FilesystemViewModel_PageTypeUpdated ( null , new PageTypeUpdatedEventArgs ( )
163
163
{
164
- IsTypeCloudDrive = InstanceViewModel . IsPageTypeCloudDrive ,
165
- IsTypeRecycleBin = InstanceViewModel . IsPageTypeRecycleBin ,
166
- IsTypeGitRepository = InstanceViewModel . IsGitRepository ,
167
- IsTypeSearchResults = InstanceViewModel . IsPageTypeSearchResults
164
+ IsTypeCloudDrive = InstanceViewModel ? . IsPageTypeCloudDrive ?? false ,
165
+ IsTypeRecycleBin = InstanceViewModel ? . IsPageTypeRecycleBin ?? false ,
166
+ IsTypeGitRepository = InstanceViewModel ? . IsGitRepository ?? false ,
167
+ IsTypeSearchResults = InstanceViewModel ? . IsPageTypeSearchResults ?? false
168
168
} ) ;
169
169
170
170
RootGrid_SizeChanged ( null , null ) ;
@@ -359,15 +359,17 @@ protected override async void FileList_PreviewKeyDown(object sender, KeyRoutedEv
359
359
if ( ctrlPressed && ! shiftPressed )
360
360
{
361
361
var folders = ParentShellPageInstance ? . SlimContentPage . SelectedItems ? . Where ( file => file . PrimaryItemAttribute == StorageItemTypes . Folder ) ;
362
- foreach ( ListedItem ? folder in folders )
362
+ if ( folders is not null )
363
363
{
364
- if ( folder is not null )
364
+ foreach ( ListedItem folder in folders )
365
365
await NavigationHelpers . OpenPathInNewTab ( folder . ItemPath ) ;
366
366
}
367
367
}
368
368
else if ( ctrlPressed && shiftPressed )
369
369
{
370
- NavigationHelpers . OpenInSecondaryPane ( ParentShellPageInstance , SelectedItems . FirstOrDefault ( item => item . PrimaryItemAttribute == StorageItemTypes . Folder ) ) ;
370
+ var selectedFolder = SelectedItems ? . FirstOrDefault ( item => item . PrimaryItemAttribute == StorageItemTypes . Folder ) ;
371
+ if ( selectedFolder is not null )
372
+ NavigationHelpers . OpenInSecondaryPane ( ParentShellPageInstance , selectedFolder ) ;
371
373
}
372
374
}
373
375
else if ( e . Key == VirtualKey . Enter && e . KeyStatus . IsMenuKeyDown )
@@ -456,9 +458,9 @@ private async void FileList_ItemTapped(object sender, TappedRoutedEventArgs e)
456
458
var item = clickedItem ? . DataContext as ListedItem ;
457
459
if ( item is null )
458
460
{
459
- if ( IsRenamingItem )
461
+ if ( IsRenamingItem && RenamingItem is not null )
460
462
{
461
- ListViewItem listViewItem = FileList . ContainerFromItem ( RenamingItem ) as ListViewItem ;
463
+ ListViewItem ? listViewItem = FileList . ContainerFromItem ( RenamingItem ) as ListViewItem ;
462
464
if ( listViewItem is not null )
463
465
{
464
466
var textBox = listViewItem . FindDescendant ( "ItemNameTextBox" ) as TextBox ;
@@ -491,11 +493,11 @@ clickedItem is Microsoft.UI.Xaml.Shapes.Rectangle
491
493
{
492
494
if ( clickedItem is TextBlock && ( ( TextBlock ) clickedItem ) . Name == "ItemName" )
493
495
{
494
- CheckRenameDoubleClick ( clickedItem ? . DataContext ) ;
496
+ CheckRenameDoubleClick ( clickedItem . DataContext ) ;
495
497
}
496
- else if ( IsRenamingItem )
498
+ else if ( IsRenamingItem && RenamingItem is not null )
497
499
{
498
- ListViewItem listViewItem = FileList . ContainerFromItem ( RenamingItem ) as ListViewItem ;
500
+ ListViewItem ? listViewItem = FileList . ContainerFromItem ( RenamingItem ) as ListViewItem ;
499
501
if ( listViewItem is not null )
500
502
{
501
503
var textBox = listViewItem . FindDescendant ( "ItemNameTextBox" ) as TextBox ;
0 commit comments