Skip to content

Commit 4e8504d

Browse files
authored
Fix: Fixed an issue where renaming a file would crash the app (#10121)
1 parent f9c0270 commit 4e8504d

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ override public void StartRenameItem()
190190
if (listViewItem == null)
191191
return;
192192

193-
TextBlock textBlock = listViewItem.FindDescendant("Name") as TextBlock;
193+
TextBlock textBlock = listViewItem.FindDescendant("ItemName") as TextBlock;
194194
textBox = listViewItem.FindDescendant("ListViewTextBoxItemName") as TextBox;
195195
textBox.Text = textBlock.Text;
196196
OldItemName = textBlock.Text;
@@ -270,7 +270,7 @@ private void EndRename(TextBox textBox)
270270
ListViewItem listViewItem = FileList.ContainerFromItem(RenamingItem) as ListViewItem;
271271
listViewItem?.Focus(FocusState.Programmatic);
272272

273-
TextBlock textBlock = listViewItem.FindDescendant("Name") as TextBlock;
273+
TextBlock textBlock = listViewItem.FindDescendant("ItemName") as TextBlock;
274274
textBox.Visibility = Visibility.Collapsed;
275275
textBlock.Visibility = Visibility.Visible;
276276
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ override public void StartRenameItem()
331331
{
332332
return;
333333
}
334-
TextBlock textBlock = listViewItem.FindDescendant("Name") as TextBlock;
334+
TextBlock textBlock = listViewItem.FindDescendant("ItemName") as TextBlock;
335335
textBox = listViewItem.FindDescendant("ItemNameTextBox") as TextBox;
336336
textBox.Text = textBlock.Text;
337337
OldItemName = textBlock.Text;
@@ -415,7 +415,7 @@ private void EndRename(TextBox textBox)
415415
}
416416
else
417417
{
418-
TextBlock textBlock = listViewItem.FindDescendant("Name") as TextBlock;
418+
TextBlock textBlock = listViewItem.FindDescendant("ItemName") as TextBlock;
419419
textBox.Visibility = Visibility.Collapsed;
420420
textBlock.Visibility = Visibility.Visible;
421421
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,15 +261,15 @@ override public void StartRenameItem()
261261
if (FolderSettings.LayoutMode == FolderLayoutModes.GridView)
262262
{
263263
Popup popup = (Popup)gridViewItem.FindDescendant("EditPopup")!;
264-
TextBlock textBlock = (TextBlock)gridViewItem.FindDescendant("Name")!;
264+
TextBlock textBlock = (TextBlock)gridViewItem.FindDescendant("ItemName")!;
265265
textBox = (TextBox)popup.Child;
266266
textBox.Text = textBlock.Text;
267267
popup.IsOpen = true;
268268
OldItemName = textBlock.Text;
269269
}
270270
else
271271
{
272-
TextBlock textBlock = (TextBlock)gridViewItem.FindDescendant("Name")!;
272+
TextBlock textBlock = (TextBlock)gridViewItem.FindDescendant("ItemName")!;
273273
textBox = (TextBox)gridViewItem.FindDescendant("TileViewTextBoxItemName")!;
274274
textBox.Text = textBlock.Text;
275275
OldItemName = textBlock.Text;

0 commit comments

Comments
 (0)