Merge branch ryujinx:master into master

This commit is contained in:
Babib3l
2025-08-28 14:08:37 +02:00
2 changed files with 5 additions and 12 deletions

View File

@@ -2,8 +2,8 @@ namespace Ryujinx.Common
{ {
public static class SharedConstants public static class SharedConstants
{ {
public const string DefaultLanPlayHost = "ryuldn.vudjun.com"; public const string DefaultLanPlayHost = "ldn.ryujinx.app";
public const short LanPlayPort = 30456; public const short LanPlayPort = 30456;
public const string DefaultLanPlayWebHost = "ryuldnweb.vudjun.com"; public const string DefaultLanPlayWebHost = DefaultLanPlayHost;
} }
} }

View File

@@ -1576,7 +1576,7 @@ namespace Ryujinx.Ava.UI.ViewModels
} }
} }
public bool InitializeUserConfig(ApplicationData application) public static bool InitializeUserConfig(ApplicationData application)
{ {
// Code where conditions will be met before loading the user configuration (Global Config) // Code where conditions will be met before loading the user configuration (Global Config)
string backendThreadingInit = Program.BackendThreadingArg ?? ConfigurationState.Instance.Graphics.BackendThreading.Value.ToString(); string backendThreadingInit = Program.BackendThreadingArg ?? ConfigurationState.Instance.Graphics.BackendThreading.Value.ToString();
@@ -1613,11 +1613,8 @@ namespace Ryujinx.Ava.UI.ViewModels
public async Task LoadApplication(ApplicationData application, bool startFullscreen = false, BlitStruct<ApplicationControlProperty>? customNacpData = null) public async Task LoadApplication(ApplicationData application, bool startFullscreen = false, BlitStruct<ApplicationControlProperty>? customNacpData = null)
{ {
if (InitializeUserConfig(application)) if (InitializeUserConfig(application))
{
return; return;
}
if (AppHost != null) if (AppHost != null)
{ {
@@ -1665,13 +1662,9 @@ namespace Ryujinx.Ava.UI.ViewModels
CanUpdate = false; CanUpdate = false;
LoadHeading = application.Name; application.Name ??= AppHost.Device.Processes.ActiveApplication.Name;
if (string.IsNullOrWhiteSpace(application.Name)) LoadHeading = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.LoadingHeading, application.Name);
{
LoadHeading = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.LoadingHeading, AppHost.Device.Processes.ActiveApplication.Name);
application.Name = AppHost.Device.Processes.ActiveApplication.Name;
}
SwitchToRenderer(startFullscreen); SwitchToRenderer(startFullscreen);