plg_ldr: Revert state back to static for now. (#7326)

drowhunter · Jan 6, 2024 · b2c740e · b2c740e
1 parent bc352e8
commit b2c740e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/core/hle/service/plgldr/plgldr.cpp b/src/core/hle/service/plgldr/plgldr.cpp
@@ -40,6 +40,10 @@ namespace Service::PLGLDR {
 
 static const Kernel::CoreVersion plgldr_version = Kernel::CoreVersion(1, 0, 0);
 
+PLG_LDR::PluginLoaderContext PLG_LDR::plgldr_context;
+bool PLG_LDR::allow_game_change = true;
+PAddr PLG_LDR::plugin_fb_addr = 0;
+
 PLG_LDR::PLG_LDR(Core::System& system_) : ServiceFramework{"plg:ldr", 1}, system(system_) {
     static const FunctionInfo functions[] = {
         // clang-format off

diff --git a/src/core/hle/service/plgldr/plgldr.h b/src/core/hle/service/plgldr/plgldr.h
@@ -104,9 +104,9 @@ class PLG_LDR final : public ServiceFramework<PLG_LDR> {
 private:
     Core::System& system;
 
-    PluginLoaderContext plgldr_context;
-    PAddr plugin_fb_addr = 0;
-    bool allow_game_change = true;
+    static PluginLoaderContext plgldr_context;
+    static PAddr plugin_fb_addr;
+    static bool allow_game_change;
 
     void IsEnabled(Kernel::HLERequestContext& ctx);
     void SetEnabled(Kernel::HLERequestContext& ctx);