Skip to content

Commit 5cf1872

Browse files
committed
Update DetailsLayoutPage.xaml.cs
1 parent 02d4c72 commit 5cf1872

1 file changed

Lines changed: 16 additions & 25 deletions

File tree

src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using CommunityToolkit.WinUI;
55
using Files.App.Controls;
66
using Files.App.UserControls.Selection;
7-
using Microsoft.Extensions.Logging;
87
using Microsoft.UI.Input;
98
using Microsoft.UI.Xaml;
109
using Microsoft.UI.Xaml.Controls;
@@ -175,30 +174,22 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
175174
// This is done to workaround a bug where CsWinRT doesn't properly track the memory of the object so that
176175
// an invalid memory access can occur when the object is moved.
177176
// See https://github.com/microsoft/CsWinRT/issues/1834.
178-
try
179-
{
180-
ColumnsViewModel.DateCreatedColumn.Update(FolderSettings.ColumnsViewModel.DateCreatedColumn);
181-
ColumnsViewModel.DateDeletedColumn.Update(FolderSettings.ColumnsViewModel.DateDeletedColumn);
182-
ColumnsViewModel.DateModifiedColumn.Update(FolderSettings.ColumnsViewModel.DateModifiedColumn);
183-
ColumnsViewModel.IconColumn.Update(FolderSettings.ColumnsViewModel.IconColumn);
184-
ColumnsViewModel.ItemTypeColumn.Update(FolderSettings.ColumnsViewModel.ItemTypeColumn);
185-
ColumnsViewModel.NameColumn.Update(FolderSettings.ColumnsViewModel.NameColumn);
186-
ColumnsViewModel.PathColumn.Update(FolderSettings.ColumnsViewModel.PathColumn);
187-
ColumnsViewModel.OriginalPathColumn.Update(FolderSettings.ColumnsViewModel.OriginalPathColumn);
188-
ColumnsViewModel.SizeColumn.Update(FolderSettings.ColumnsViewModel.SizeColumn);
189-
ColumnsViewModel.StatusColumn.Update(FolderSettings.ColumnsViewModel.StatusColumn);
190-
ColumnsViewModel.TagColumn.Update(FolderSettings.ColumnsViewModel.TagColumn);
191-
ColumnsViewModel.GitStatusColumn.Update(FolderSettings.ColumnsViewModel.GitStatusColumn);
192-
ColumnsViewModel.GitLastCommitDateColumn.Update(FolderSettings.ColumnsViewModel.GitLastCommitDateColumn);
193-
ColumnsViewModel.GitLastCommitMessageColumn.Update(FolderSettings.ColumnsViewModel.GitLastCommitMessageColumn);
194-
ColumnsViewModel.GitCommitAuthorColumn.Update(FolderSettings.ColumnsViewModel.GitCommitAuthorColumn);
195-
ColumnsViewModel.GitLastCommitShaColumn.Update(FolderSettings.ColumnsViewModel.GitLastCommitShaColumn);
196-
}
197-
catch (Exception ex)
198-
{
199-
// Same #1834 bug: the Update raises PropertyChanged into a classic Width binding whose ICustomProperty target was moved by the GC, throwing an NRE that would otherwise fail the navigation and take down the app. The persisted widths get reapplied on the next update.
200-
App.Logger.LogWarning(ex, "Failed to restore details column widths during navigation");
201-
}
177+
ColumnsViewModel.DateCreatedColumn.Update(FolderSettings.ColumnsViewModel.DateCreatedColumn);
178+
ColumnsViewModel.DateDeletedColumn.Update(FolderSettings.ColumnsViewModel.DateDeletedColumn);
179+
ColumnsViewModel.DateModifiedColumn.Update(FolderSettings.ColumnsViewModel.DateModifiedColumn);
180+
ColumnsViewModel.IconColumn.Update(FolderSettings.ColumnsViewModel.IconColumn);
181+
ColumnsViewModel.ItemTypeColumn.Update(FolderSettings.ColumnsViewModel.ItemTypeColumn);
182+
ColumnsViewModel.NameColumn.Update(FolderSettings.ColumnsViewModel.NameColumn);
183+
ColumnsViewModel.PathColumn.Update(FolderSettings.ColumnsViewModel.PathColumn);
184+
ColumnsViewModel.OriginalPathColumn.Update(FolderSettings.ColumnsViewModel.OriginalPathColumn);
185+
ColumnsViewModel.SizeColumn.Update(FolderSettings.ColumnsViewModel.SizeColumn);
186+
ColumnsViewModel.StatusColumn.Update(FolderSettings.ColumnsViewModel.StatusColumn);
187+
ColumnsViewModel.TagColumn.Update(FolderSettings.ColumnsViewModel.TagColumn);
188+
ColumnsViewModel.GitStatusColumn.Update(FolderSettings.ColumnsViewModel.GitStatusColumn);
189+
ColumnsViewModel.GitLastCommitDateColumn.Update(FolderSettings.ColumnsViewModel.GitLastCommitDateColumn);
190+
ColumnsViewModel.GitLastCommitMessageColumn.Update(FolderSettings.ColumnsViewModel.GitLastCommitMessageColumn);
191+
ColumnsViewModel.GitCommitAuthorColumn.Update(FolderSettings.ColumnsViewModel.GitCommitAuthorColumn);
192+
ColumnsViewModel.GitLastCommitShaColumn.Update(FolderSettings.ColumnsViewModel.GitLastCommitShaColumn);
202193
}
203194

204195
shellViewModel.EnabledGitProperties = GetEnabledGitProperties(ColumnsViewModel);

0 commit comments

Comments
 (0)