Merge pull request #7019 from ameerj/videocore-jthread

videocore: Use std::jthread for worker threads

1 files changed, 1 insertions, 5 deletions

diff --git a/src/core/core.cpp b/src/core/core.cpp
index b13350f6e5..54ebed2c16 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -305,10 +305,7 @@ struct System::Impl {
         is_powered_on = false;
         exit_lock = false;
 
-        if (gpu_core) {
-            gpu_core->ShutDown();
-        }
-
+        gpu_core.reset();
         services.reset();
         service_manager.reset();
         cheat_engine.reset();
@@ -317,7 +314,6 @@ struct System::Impl {
         time_manager.Shutdown();
         core_timing.Shutdown();
         app_loader.reset();
-        gpu_core.reset();
         perf_stats.reset();
         kernel.Shutdown();
         memory.Reset();