Ensure service init runs after Horizon constructor (#6342)

This commit is contained in:
gdkchan 2024-02-22 13:55:29 -03:00 committed by GitHub
parent 167f50bbcd
commit c43fb92bbf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions

View file

@ -250,7 +250,6 @@ namespace Ryujinx.HLE.HOS
SurfaceFlinger = new SurfaceFlinger(device); SurfaceFlinger = new SurfaceFlinger(device);
InitializeAudioRenderer(TickSource); InitializeAudioRenderer(TickSource);
InitializeServices();
} }
private void InitializeAudioRenderer(ITickSource tickSource) private void InitializeAudioRenderer(ITickSource tickSource)
@ -301,7 +300,7 @@ namespace Ryujinx.HLE.HOS
AudioManager.Start(); AudioManager.Start();
} }
private void InitializeServices() public void InitializeServices()
{ {
SmRegistry = new SmRegistry(); SmRegistry = new SmRegistry();
SmServer = new ServerBase(KernelContext, "SmServer", () => new IUserInterface(KernelContext, SmRegistry)); SmServer = new ServerBase(KernelContext, "SmServer", () => new IUserInterface(KernelContext, SmRegistry));

View file

@ -55,6 +55,7 @@ namespace Ryujinx.HLE
Processes = new ProcessLoader(this); Processes = new ProcessLoader(this);
TamperMachine = new TamperMachine(); TamperMachine = new TamperMachine();
System.InitializeServices();
System.State.SetLanguage(Configuration.SystemLanguage); System.State.SetLanguage(Configuration.SystemLanguage);
System.State.SetRegion(Configuration.Region); System.State.SetRegion(Configuration.Region);