manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2024-12-27 11:03:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change behavior of default user creation. (#3396)

Browse source 
Change AccountManager to create a random id for the default user.
Change UserEditorView to not show the 'Delete' button if there is only one user present.
This commit is contained in:
Diana Atsuko Herring 2024-03-30 22:28:14 -05:00
parent 7124d679fd
commit ba9e0ca6dc
No known key found for this signature in database
GPG key ID: 401811DABE38E924
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Ryujinx.HLE/HOS/Services/Account/Acc/AccountManager.cs
View file

@ -37,13 +37,16 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc
_accountSaveDataManager = new AccountSaveDataManager(_profiles); _accountSaveDataManager = new AccountSaveDataManager(_profiles);
if (!_profiles.TryGetValue(DefaultUserId.ToString(), out _)) if (_profiles.IsEmpty)
{ {
byte[] defaultUserImage = EmbeddedResources.Read("Ryujinx.HLE/HOS/Services/Account/Acc/DefaultUserImage.jpg"); byte[] defaultUserImage = EmbeddedResources.Read("Ryujinx.HLE/HOS/Services/Account/Acc/DefaultUserImage.jpg");
AddUser("RyuPlayer", defaultUserImage, DefaultUserId); // Use a random UserId as default to avoid issues in multiplayer per #3396.
UserId userId = new UserId(Guid.NewGuid().ToString().Replace("-", ""));
AddUser("RyuPlayer", defaultUserImage, userId);
OpenUser(DefaultUserId); OpenUser(userId);
} }
else else
{ {

6
src/Ryujinx/UI/Views/User/UserEditorView.axaml.cs
View file

@ -1,13 +1,13 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Data; using Avalonia.Data;
using Avalonia.Interactivity; using Avalonia.Interactivity;
using FluentAvalonia.Core;
using FluentAvalonia.UI.Controls; using FluentAvalonia.UI.Controls;
using FluentAvalonia.UI.Navigation; using FluentAvalonia.UI.Navigation;
using Ryujinx.Ava.Common.Locale; using Ryujinx.Ava.Common.Locale;
using Ryujinx.Ava.UI.Controls; using Ryujinx.Ava.UI.Controls;
using Ryujinx.Ava.UI.Helpers; using Ryujinx.Ava.UI.Helpers;
using Ryujinx.Ava.UI.Models; using Ryujinx.Ava.UI.Models;
using Ryujinx.HLE.HOS.Services.Account.Acc;
using System; using System;
using UserProfile = Ryujinx.Ava.UI.Models.UserProfile; using UserProfile = Ryujinx.Ava.UI.Models.UserProfile;
@ -21,7 +21,9 @@ namespace Ryujinx.Ava.UI.Views.User
public TempProfile TempProfile { get; set; } public TempProfile TempProfile { get; set; }
public static uint MaxProfileNameLength => 0x20; public static uint MaxProfileNameLength => 0x20;
public bool IsDeletable => _profile.UserId != AccountManager.DefaultUserId;
// Don't allow deletion if there is only one user
public bool IsDeletable => _parent.AccountManager.GetAllUsers().Count() != 1;
public UserEditorView() public UserEditorView()
{ {