aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStarlet <gpyron@mail.com>2018-06-12 20:51:59 -0400
committerStarlet <gpyron@mail.com>2018-06-12 20:51:59 -0400
commitc646a009188252bb30785992f7e19155e1bf70a7 (patch)
tree7f6448b82bfc99bd8d924350d7de746fc6f3677d
parent8442a5917f39b9d1e338234d4f300671ce295141 (diff)
Compliant with review.
-rw-r--r--Ryujinx.HLE/OsHle/Services/Pctl/IParentalControlService.cs14
-rw-r--r--Ryujinx.HLE/OsHle/Services/Pctl/IParentalControlServiceFactory.cs6
2 files changed, 12 insertions, 8 deletions
diff --git a/Ryujinx.HLE/OsHle/Services/Pctl/IParentalControlService.cs b/Ryujinx.HLE/OsHle/Services/Pctl/IParentalControlService.cs
index c88545c6..60a69f58 100644
--- a/Ryujinx.HLE/OsHle/Services/Pctl/IParentalControlService.cs
+++ b/Ryujinx.HLE/OsHle/Services/Pctl/IParentalControlService.cs
@@ -10,22 +10,30 @@ namespace Ryujinx.HLE.OsHle.Services.Pctl
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
- public bool Initialized = false;
+ private bool Initialized = false;
- public IParentalControlService()
+ private bool NeedInitialize;
+
+ public IParentalControlService(bool NeedInitialize = true)
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 1, Initialize }
};
+
+ this.NeedInitialize = NeedInitialize;
}
public long Initialize(ServiceCtx Context)
{
- if (!Initialized)
+ if (NeedInitialize && !Initialized)
+ {
Initialized = true;
+ }
else
+ {
Context.Ns.Log.PrintWarning(LogClass.ServicePctl, "Service is already initialized!");
+ }
return 0;
}
diff --git a/Ryujinx.HLE/OsHle/Services/Pctl/IParentalControlServiceFactory.cs b/Ryujinx.HLE/OsHle/Services/Pctl/IParentalControlServiceFactory.cs
index 5a7b2c29..7ef91d7f 100644
--- a/Ryujinx.HLE/OsHle/Services/Pctl/IParentalControlServiceFactory.cs
+++ b/Ryujinx.HLE/OsHle/Services/Pctl/IParentalControlServiceFactory.cs
@@ -27,11 +27,7 @@ namespace Ryujinx.HLE.OsHle.Services.Pctl
public long CreateServiceWithoutInitialize(ServiceCtx Context)
{
- IParentalControlService Service = new IParentalControlService();
-
- Service.Initialized = true;
-
- MakeObject(Context, Service);
+ MakeObject(Context, new IParentalControlService(false));
return 0;
}