Skip to content

Avalonia: Fix webview crash. CR:forestmaxime #4777

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
Gabriel Dufresne (GabrielDuf) merged 4 commits into from
May 14, 2026
+25 −8
Merged

Avalonia: Fix webview crash. CR:forestmaxime #4777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd4494b
potential fix for the crash
GabrielDuf May 14, 2026
ee6b620
add rootMode all
GabrielDuf May 14, 2026
c344f7f
Change default location
GabrielDuf May 14, 2026
9520663
removed useless trim workaround
GabrielDuf May 14, 2026
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: 6 additions & 4 deletions src/UniGetUI.Avalonia/App.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,15 +158,17 @@ public static void ApplyTheme(string value)
};
}

public static string WebViewUserDataFolder { get; } =
Path.Join(Path.GetTempPath(), "UniGetUI", "WebView");

private static void SetUpWebViewUserDataFolder()
{
try
{
string webViewPath = Path.Join(Path.GetTempPath(), "UniGetUI", "WebView");
if (!Directory.Exists(webViewPath))
Directory.CreateDirectory(webViewPath);
if (!Directory.Exists(WebViewUserDataFolder))
Directory.CreateDirectory(WebViewUserDataFolder);

Environment.SetEnvironmentVariable("WEBVIEW2_USER_DATA_FOLDER", webViewPath);
Environment.SetEnvironmentVariable("WEBVIEW2_USER_DATA_FOLDER", WebViewUserDataFolder);
}
catch (Exception e)
{
Expand Down
16 changes: 16 additions & 0 deletions src/UniGetUI.Avalonia/Views/Controls/UniGetUiWebView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
using Avalonia.Controls;
using Avalonia.Platform;

namespace UniGetUI.Avalonia.Views.Controls;

public sealed class UniGetUiWebView : NativeWebView
{
public UniGetUiWebView()
{
EnvironmentRequested += (_, args) =>
{
if (args is WindowsWebView2EnvironmentRequestedEventArgs winArgs)
winArgs.UserDataFolder = App.WebViewUserDataFolder;
};
}
}
3 changes: 1 addition & 2 deletions src/UniGetUI.Avalonia/Views/Pages/HelpPage.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages"
xmlns:controls="using:UniGetUI.Avalonia.Views.Controls"
xmlns:wv="using:Avalonia.Controls"
xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Expand Down Expand Up @@ -75,7 +74,7 @@

<!-- WebView -->
<Border x:Name="WebViewBorder" Grid.Row="2" CornerRadius="6" ClipToBounds="True">
<wv:NativeWebView x:Name="WebViewControl"/>
<controls:UniGetUiWebView x:Name="WebViewControl"/>
</Border>

<!-- Linux fallback -->
Expand Down
4 changes: 2 additions & 2 deletions src/UniGetUI.Avalonia/Views/Pages/ReleaseNotesPage.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages"
xmlns:wv="using:Avalonia.Controls"
xmlns:controls="using:UniGetUI.Avalonia.Views.Controls"
xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Expand Down Expand Up @@ -36,7 +36,7 @@

<!-- WebView -->
<Border x:Name="WebViewBorder" Grid.Row="2" CornerRadius="6" ClipToBounds="True">
<wv:NativeWebView x:Name="WebViewControl"/>
<controls:UniGetUiWebView x:Name="WebViewControl"/>
</Border>

<!-- Linux fallback -->
Expand Down
Loading