Fix: Fixed issue where middle clicking selected folders would cause c…

…rash (#12683)
files-community · Jun 22, 2023 · 716eec0 · 716eec0
1 parent 0e5691a
commit 716eec0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs
@@ -269,7 +269,7 @@ override public void StartRenameItem()
 				return;
 
 			var textBox = listViewItem.FindDescendant("ItemNameTextBox") as TextBox;
-			if (textBox is null)
+			if (textBox is null || textBox.FindParent<Grid>() is null)
 				return;
 
 			Grid.SetColumnSpan(textBox.FindParent<Grid>(), 8);

diff --git a/src/Files.App/Views/LayoutModes/StandardLayoutMode.cs b/src/Files.App/Views/LayoutModes/StandardLayoutMode.cs
@@ -188,6 +188,14 @@ protected virtual void StartRenameItem(string itemNameTextBox)
 			OldItemName = textBlock.Text;
 			textBlock.Visibility = Visibility.Collapsed;
 			textBox.Visibility = Visibility.Visible;
+
+			if (textBox.FindParent<Grid>() is null)
+			{
+				textBlock.Visibility = Visibility.Visible;
+				textBox.Visibility = Visibility.Collapsed;
+				return;
+			}
+
 			Grid.SetColumnSpan(textBox.FindParent<Grid>(), 8);
 
 			textBox.Focus(FocusState.Pointer);