From b2c740ee0e8e10991caf4de78032ef22d9844355 Mon Sep 17 00:00:00 2001
From: Steveice10 <1269164+Steveice10@users.noreply.github.com>
Date: Sat, 6 Jan 2024 15:21:42 -0800
Subject: [PATCH] plg_ldr: Revert state back to static for now. (#7326)

---
 src/core/hle/service/plgldr/plgldr.cpp | 4 ++++
 src/core/hle/service/plgldr/plgldr.h   | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/core/hle/service/plgldr/plgldr.cpp b/src/core/hle/service/plgldr/plgldr.cpp
index e460228156..376a440d3f 100644
--- 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
index 23d44f38e3..ecaeec7db1 100644
--- a/src/core/hle/service/plgldr/plgldr.h
+++ b/src/core/hle/service/plgldr/plgldr.h
@@ -104,9 +104,9 @@ public:
 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);