From 00ce9eea620652b97b4d3e8cd9218c6fccff8b1c Mon Sep 17 00:00:00 2001 From: Mary Date: Tue, 29 Jun 2021 19:37:13 +0200 Subject: Fix disposing of IPC sessions server at emulation stop (#2334) --- Ryujinx.HLE/HOS/Services/Nifm/StaticService/IGeneralService.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'Ryujinx.HLE/HOS/Services/Nifm/StaticService') diff --git a/Ryujinx.HLE/HOS/Services/Nifm/StaticService/IGeneralService.cs b/Ryujinx.HLE/HOS/Services/Nifm/StaticService/IGeneralService.cs index e650879b..2296838e 100644 --- a/Ryujinx.HLE/HOS/Services/Nifm/StaticService/IGeneralService.cs +++ b/Ryujinx.HLE/HOS/Services/Nifm/StaticService/IGeneralService.cs @@ -10,7 +10,7 @@ using System.Text; namespace Ryujinx.HLE.HOS.Services.Nifm.StaticService { - class IGeneralService : IpcService, IDisposable + class IGeneralService : DisposableIpcService { private GeneralServiceDetail _generalServiceDetail; @@ -197,9 +197,12 @@ namespace Ryujinx.HLE.HOS.Services.Nifm.StaticService return (targetProperties, targetAddressInfo); } - public void Dispose() + protected override void Dispose(bool isDisposing) { - GeneralServiceManager.Remove(_generalServiceDetail.ClientId); + if (isDisposing) + { + GeneralServiceManager.Remove(_generalServiceDetail.ClientId); + } } } } \ No newline at end of file -- cgit v1.2.3