Fix disposing of IPC sessions server at emulation stop (#2334)

1 files changed, 6 insertions, 3 deletions

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