Skip to content

Commit 8dbebce

Browse files
authored
Fix: Fixed crash that would occur when opening multiple items (#10951)
1 parent f8b3fb0 commit 8dbebce

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

src/Files.App/Views/LayoutModes/ColumnViewBase.xaml.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -410,12 +410,12 @@ private async void FileList_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
410410
if (IsRenamingItem)
411411
return;
412412

413+
e.Handled = true;
414+
413415
if (IsItemSelected && SelectedItem.PrimaryItemAttribute == StorageItemTypes.Folder)
414416
ItemInvoked?.Invoke(new ColumnParam { NavPathParam = (SelectedItem is ShortcutItem sht ? sht.TargetPath : SelectedItem.ItemPath), ListView = FileList }, EventArgs.Empty);
415417
else
416-
_ = NavigationHelpers.OpenSelectedItems(ParentShellPageInstance, false);
417-
418-
e.Handled = true;
418+
await NavigationHelpers.OpenSelectedItems(ParentShellPageInstance, false);
419419
}
420420
else if (e.Key == VirtualKey.Enter && e.KeyStatus.IsMenuKeyDown)
421421
{

src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,8 @@ private async void FileList_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
431431
if (IsRenamingItem)
432432
return;
433433

434+
e.Handled = true;
435+
434436
if (ctrlPressed)
435437
{
436438
var folders = ParentShellPageInstance?.SlimContentPage.SelectedItems?.Where(file => file.PrimaryItemAttribute == StorageItemTypes.Folder);
@@ -445,7 +447,6 @@ private async void FileList_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
445447
await NavigationHelpers.OpenSelectedItems(ParentShellPageInstance, false);
446448
FileList.SelectedIndex = 0;
447449
}
448-
e.Handled = true;
449450
}
450451
else if (e.Key == VirtualKey.Enter && e.KeyStatus.IsMenuKeyDown)
451452
{

src/Files.App/Views/LayoutModes/GridViewBrowser.xaml.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,8 @@ private async void FileList_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
383383
if (IsRenamingItem)
384384
return;
385385

386+
e.Handled = true;
387+
386388
if (ctrlPressed)
387389
{
388390
var folders = ParentShellPageInstance?.SlimContentPage.SelectedItems?.Where(file => file.PrimaryItemAttribute == StorageItemTypes.Folder);
@@ -394,9 +396,8 @@ private async void FileList_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
394396
}
395397
else
396398
{
397-
_ = NavigationHelpers.OpenSelectedItems(ParentShellPageInstance, false);
399+
await NavigationHelpers.OpenSelectedItems(ParentShellPageInstance, false);
398400
}
399-
e.Handled = true;
400401
}
401402
else if (e.Key == VirtualKey.Enter && e.KeyStatus.IsMenuKeyDown)
402403
{

0 commit comments

Comments
 (0)