Skip to content

Commit 0093c5e

Browse files
authored
Fix: Fixed crash that would occur when starting Files from WSL directories (#16617)
1 parent 6089e6f commit 0093c5e

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/Files.App/Helpers/Application/AppLifecycleHelper.cs

+1
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ public static void ConfigureSentry()
133133
public static IHost ConfigureHost()
134134
{
135135
var builder = Host.CreateDefaultBuilder()
136+
.UseContentRoot(Package.Current.InstalledLocation.Path)
136137
.UseEnvironment(AppLifecycleHelper.AppEnvironment.ToString())
137138
.ConfigureLogging(builder => builder
138139
.ClearProviders()

src/Files.App/ViewModels/MainPageViewModel.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,9 @@ public async Task OnNavigatedToAsync(NavigationEventArgs e)
154154
// add last session tabs to closed tabs stack if those tabs are not about to be opened
155155
if (!UserSettingsService.AppSettingsService.RestoreTabsOnStartup && !UserSettingsService.GeneralSettingsService.ContinueLastSessionOnStartUp && UserSettingsService.GeneralSettingsService.LastSessionTabList != null)
156156
{
157-
var items = new TabBarItemParameter[UserSettingsService.GeneralSettingsService.LastSessionTabList.Count];
158-
for (int i = 0; i < items.Length; i++)
159-
items[i] = TabBarItemParameter.Deserialize(UserSettingsService.GeneralSettingsService.LastSessionTabList[i]);
157+
var items = UserSettingsService.GeneralSettingsService.LastSessionTabList
158+
.Where(tab => !string.IsNullOrEmpty(tab))
159+
.Select(tab => TabBarItemParameter.Deserialize(tab)).ToArray();
160160

161161
BaseTabBar.PushRecentTab(items);
162162
}

0 commit comments

Comments
 (0)