Skip to content

Commit 37992e3

Browse files
committed
fix: gamescope crash due to gsettings probe
1 parent 83eae59 commit 37992e3

2 files changed

Lines changed: 10 additions & 1 deletion

File tree

VRCFaceTracking/App.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
</Application.Resources>
2323

2424
<Application.Styles>
25-
<sty:FluentAvaloniaTheme PreferSystemTheme="True" PreferUserAccentColor="True" />
25+
<sty:FluentAvaloniaTheme PreferSystemTheme="False" PreferUserAccentColor="True" />
2626
</Application.Styles>
2727
</Application>

VRCFaceTracking/App.axaml.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Microsoft.Extensions.Logging;
55
using Avalonia.Data.Core.Plugins;
66
using CommunityToolkit.Mvvm.DependencyInjection;
7+
using FluentAvalonia.Styling;
78
using Microsoft.Extensions.Hosting;
89
using VRCFaceTracking.Contracts.Services;
910
using VRCFaceTracking.Views;
@@ -21,6 +22,14 @@ public override void Initialize()
2122
{
2223
AvaloniaXamlLoader.Load(this);
2324

25+
// gsettings breaks gamescope on linux and system theme is unreliable on plasma anyways
26+
if (!OperatingSystem.IsLinux())
27+
{
28+
var faTheme = Styles.OfType<FluentAvaloniaTheme>().FirstOrDefault();
29+
if (faTheme is not null)
30+
faTheme.PreferSystemTheme = true;
31+
}
32+
2433
#if DEBUG
2534
var loggerFactory = LoggerFactory.Create(b => b
2635
.SetMinimumLevel(LogLevel.Information)

0 commit comments

Comments
 (0)