Merge pull request #12669 from mitaclaw/core-global-system-3

Core::GetState: Avoid Global System Accessor

1 files changed, 3 insertions, 2 deletions

diff --git a/Source/Core/InputCommon/GCAdapter.cpp b/Source/Core/InputCommon/GCAdapter.cpp
index f839f4b018..01cfcd2f92 100644
--- a/Source/Core/InputCommon/GCAdapter.cpp
+++ b/Source/Core/InputCommon/GCAdapter.cpp
@@ -432,9 +432,10 @@ void Init()
     return;
 #endif
 
-  if (Core::GetState() != Core::State::Uninitialized && Core::GetState() != Core::State::Starting)
+  auto& system = Core::System::GetInstance();
+  if (const Core::State state = Core::GetState(system);
+      state != Core::State::Uninitialized && state != Core::State::Starting)
   {
-    auto& system = Core::System::GetInstance();
     auto& core_timing = system.GetCoreTiming();
     if ((core_timing.GetTicks() - s_last_init) < system.GetSystemTimers().GetTicksPerSecond())
       return;