Skip to content

Fix: Fixed NullReferenceException with ColumnViewBase.EndRename #13771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 9, 2023
Merged

Fix: Fixed NullReferenceException with ColumnViewBase.EndRename #13771

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0225336
Fix: Fixed NullReferenceException with ColumnViewBase.EndRename
yaira2 Nov 9, 2023
e456ac7
Update ColumnViewBase.xaml.cs
yaira2 Nov 9, 2023
372e29d
Update ColumnViewBase.xaml.cs
yaira2 Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions src/Files.App/Views/LayoutModes/ColumnViewBase.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using CommunityToolkit.WinUI.UI;
using Files.App.UserControls.Selection;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Input;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
Expand All @@ -13,9 +14,8 @@
using Windows.Storage;
using Windows.System;
using Windows.UI.Core;
using DispatcherQueueTimer = Microsoft.UI.Dispatching.DispatcherQueueTimer;
using static Files.App.Constants;
using Microsoft.UI.Dispatching;
using DispatcherQueueTimer = Microsoft.UI.Dispatching.DispatcherQueueTimer;

namespace Files.App.Views.LayoutModes
{
Expand Down Expand Up @@ -169,16 +169,8 @@ await ValidateItemNameInputTextAsync(textBox, args, (showError) =>

protected override void EndRename(TextBox textBox)
{
if (textBox is not null && textBox.Parent is not null)
{
// Re-focus selected list item
var listViewItem = FileList.ContainerFromItem(RenamingItem) as ListViewItem;
listViewItem?.Focus(FocusState.Programmatic);

var textBlock = listViewItem?.FindDescendant("ItemName") as TextBlock;
textBox!.Visibility = Visibility.Collapsed;
textBlock!.Visibility = Visibility.Visible;
}
FileNameTeachingTip.IsOpen = false;
IsRenamingItem = false;

// Unsubscribe from events
if (textBox is not null)
Expand All @@ -187,8 +179,19 @@ protected override void EndRename(TextBox textBox)
textBox.KeyDown -= RenameTextBox_KeyDown;
}

FileNameTeachingTip.IsOpen = false;
IsRenamingItem = false;
if (textBox is not null && textBox.Parent is not null)
{
ListViewItem? listViewItem = FileList.ContainerFromItem(RenamingItem) as ListViewItem;
if (listViewItem is null)
return;

// Re-focus selected list item
listViewItem.Focus(FocusState.Programmatic);

TextBlock? textBlock = listViewItem.FindDescendant("ItemName") as TextBlock;
textBox!.Visibility = Visibility.Collapsed;
textBlock!.Visibility = Visibility.Visible;
}
}

public override void ResetItemOpacity()
Expand Down