Skip to content

Commit 0f3fc5b

Browse files
authored
Fix PageContext (#11751)
1 parent 06032a6 commit 0f3fc5b

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

src/Files.App/Contexts/Page/PageContext.cs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,14 @@ public PageContext()
2525

2626
private void Page_CurrentInstanceChanged(object? sender, PaneHolderPage? modifiedPage)
2727
{
28-
bool isCurrent = modifiedPage?.IsCurrentInstance ?? false;
29-
var newPage = isCurrent ? modifiedPage : null;
30-
UpdatePage(newPage);
28+
if (page is not null && !page.IsCurrentInstance)
29+
{
30+
UpdatePage(null);
31+
}
32+
else if (modifiedPage is not null && modifiedPage.IsCurrentInstance)
33+
{
34+
UpdatePage(modifiedPage);
35+
}
3136
}
3237

3338
private void Page_ContentChanged(object? sender, TabItemArguments e)
@@ -37,12 +42,9 @@ private void Page_ContentChanged(object? sender, TabItemArguments e)
3742

3843
private void Page_PropertyChanged(object? sender, PropertyChangedEventArgs e)
3944
{
40-
switch (e.PropertyName)
45+
if (e.PropertyName is nameof(IPaneHolder.ActivePaneOrColumn))
4146
{
42-
case nameof(IPaneHolder.ActivePane):
43-
case nameof(IPaneHolder.ActivePaneOrColumn):
44-
UpdateContent();
45-
break;
47+
UpdateContent();
4648
}
4749
}
4850

0 commit comments

Comments
 (0)