Skip to content

Fix crash when dropping tab outside tabstrip #1941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 21, 2020
Merged

Fix crash when dropping tab outside tabstrip #1941

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions Files/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ private async void TabStrip_TabDroppedOutside(TabView sender, TabViewTabDroppedO
}

var indexOfTabViewItem = sender.TabItems.IndexOf(args.Tab);
var tabViewItemPath = ((((args.Item as TabItem).Content as Grid).Children[0] as Frame).Content as IShellPage).NavigationToolbar.PathControlDisplayText;
var tabViewItemPath = ((((args.Item as TabItem).Content as Grid).Children[0] as Frame).Tag as TabItemContent).NavigationArg;
var selectedTabViewItemIndex = sender.SelectedIndex;
RemoveTab(args.Item as TabItem);
if (!await Interaction.OpenPathInNewWindow(tabViewItemPath))
Expand All @@ -338,17 +338,16 @@ private async void TabStrip_TabDroppedOutside(TabView sender, TabViewTabDroppedO
}
}

private async void RemoveTab(TabItem tabItem)
private void RemoveTab(TabItem tabItem)
{
if (Items.Count == 1)
{
MainPage.AppInstances.Remove(tabItem);
await ApplicationView.GetForCurrentView().TryConsolidateAsync();
App.CloseApp();
}
else if (Items.Count > 1)
{
Items.Remove(tabItem);
//App.InteractionViewModel.TabStripSelectedIndex = verticalTabView.SelectedIndex;
}
}
}
Expand Down