Skip to content

Commit 8501bc9

Browse files
authored
Fix a crash that would occur when no multitasking option was selected (#1973)
1 parent 964de9d commit 8501bc9

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

Files/BaseLayout.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,10 @@ protected override async void OnNavigatedTo(NavigationEventArgs eventArgs)
258258
App.CurrentInstance.InstanceViewModel.IsPageTypeRecycleBin = workingDir.StartsWith(App.AppSettings.RecycleBinPath);
259259
App.CurrentInstance.InstanceViewModel.IsPageTypeMtpDevice = workingDir.StartsWith("\\\\?\\");
260260

261-
await App.MultitaskingControl?.SetSelectedTabInfo(new DirectoryInfo(workingDir).Name, workingDir);
261+
if (App.MultitaskingControl != null)
262+
{
263+
await App.MultitaskingControl.SetSelectedTabInfo(new DirectoryInfo(workingDir).Name, workingDir);
264+
}
262265
App.CurrentInstance.FilesystemViewModel.RefreshItems();
263266

264267
App.MultitaskingControl?.SelectionChanged();

Files/Views/SettingsPages/Multitasking.xaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
x:Name="AdaptiveMultToggle"
3636
x:Uid="SettingsMultitaskingAdaptive"
3737
Content="Adaptive (Recommended)"
38-
IsChecked="{x:Bind AppSettings.IsMultitaskingExperienceAdaptive, Mode=TwoWay}" />
38+
GroupName="MultitaskingSettingRadioGroup"
39+
IsChecked="{x:Bind AppSettings.IsMultitaskingExperienceAdaptive, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
3940
<TextBlock
4041
x:Uid="SettingsMultitaskingAdaptiveDescription"
4142
MaxWidth="450"
@@ -49,7 +50,8 @@
4950
x:Uid="SettingsMultitaskingHorizontal"
5051
Margin="0,18,0,0"
5152
Content="Horizontal"
52-
IsChecked="{x:Bind AppSettings.IsHorizontalTabStripEnabled, Mode=TwoWay}" />
53+
GroupName="MultitaskingSettingRadioGroup"
54+
IsChecked="{x:Bind AppSettings.IsHorizontalTabStripEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
5355
<TextBlock
5456
x:Uid="SettingsMultitaskingHorizontalDescription"
5557
MaxWidth="450"
@@ -63,7 +65,8 @@
6365
x:Uid="SettingsMultitaskingVertical"
6466
Margin="0,18,0,0"
6567
Content="Vertical"
66-
IsChecked="{x:Bind AppSettings.IsVerticalTabFlyoutEnabled, Mode=TwoWay}" />
68+
GroupName="MultitaskingSettingRadioGroup"
69+
IsChecked="{x:Bind AppSettings.IsVerticalTabFlyoutEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
6770
<TextBlock
6871
x:Uid="SettingsMultitaskingVerticalDescription"
6972
MaxWidth="450"

0 commit comments

Comments
 (0)