Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion Source/Avalonia.WebView/WebView-Core.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,15 @@ async Task<bool> Navigate(Uri? uri)
return false;
}

return _platformWebView.Navigate(uri);
if (_platformWebView is null)
return false;
try
{
return _platformWebView.Navigate(uri);
}catch (Exception ex)
{
return false;
}
}

async Task<bool> NavigateToString(string? htmlContent)
Expand Down
3 changes: 2 additions & 1 deletion Source/Avalonia.WebView/WebView-Override.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ protected override async void OnAttachedToVisualTree(VisualTreeAttachmentEventAr
protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
{
base.OnDetachedFromVisualTree(e);
Child = null;
//Child = null;
_partInnerContainer.Child = null;
_platformWebView?.Dispose();
_platformWebView = null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,12 @@
x:Class="SampleWebView.Views.MainWindow"
Icon="/Assets/avalonia-logo.ico"
Title="SampleWebView">
<views:MainView />
<TabControl x:Name="tabControl" TabStripPlacement="Top" >
<TabItem Header="Tab 1">
<views:MainView />
</TabItem>
<TabItem Header="Tab 2">
<views:MainView />
</TabItem>
</TabControl>
</Window>