summaryrefslogtreecommitdiff
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorGravatar Narr the Reg2024-02-17 17:00:07 -0600
committerGravatar GitHub2024-02-17 17:00:07 -0600
commit53f8383354470d58ab7a6cb5303708d59883adfa (patch)
tree66f830fa18e36c599315475670dfd92c5ef73b45 /src/core/core.cpp
parentMerge pull request #13040 from Kelebek1/timezone_shutdown (diff)
parentkernel: add and enable system suspend type (diff)
downloadyuzu-53f8383354470d58ab7a6cb5303708d59883adfa.tar.gz
yuzu-53f8383354470d58ab7a6cb5303708d59883adfa.tar.xz
yuzu-53f8383354470d58ab7a6cb5303708d59883adfa.zip
Merge pull request #13017 from liamwhite/suspension
kernel: add and enable system suspend type
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r--src/core/core.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 435ef6793..bd5f11d53 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -242,7 +242,7 @@ struct System::Impl {
242 void Run() { 242 void Run() {
243 std::unique_lock<std::mutex> lk(suspend_guard); 243 std::unique_lock<std::mutex> lk(suspend_guard);
244 244
245 kernel.SuspendApplication(false); 245 kernel.SuspendEmulation(false);
246 core_timing.SyncPause(false); 246 core_timing.SyncPause(false);
247 is_paused.store(false, std::memory_order_relaxed); 247 is_paused.store(false, std::memory_order_relaxed);
248 } 248 }
@@ -251,7 +251,7 @@ struct System::Impl {
251 std::unique_lock<std::mutex> lk(suspend_guard); 251 std::unique_lock<std::mutex> lk(suspend_guard);
252 252
253 core_timing.SyncPause(true); 253 core_timing.SyncPause(true);
254 kernel.SuspendApplication(true); 254 kernel.SuspendEmulation(true);
255 is_paused.store(true, std::memory_order_relaxed); 255 is_paused.store(true, std::memory_order_relaxed);
256 } 256 }
257 257
@@ -261,7 +261,7 @@ struct System::Impl {
261 261
262 std::unique_lock<std::mutex> StallApplication() { 262 std::unique_lock<std::mutex> StallApplication() {
263 std::unique_lock<std::mutex> lk(suspend_guard); 263 std::unique_lock<std::mutex> lk(suspend_guard);
264 kernel.SuspendApplication(true); 264 kernel.SuspendEmulation(true);
265 core_timing.SyncPause(true); 265 core_timing.SyncPause(true);
266 return lk; 266 return lk;
267 } 267 }
@@ -269,7 +269,7 @@ struct System::Impl {
269 void UnstallApplication() { 269 void UnstallApplication() {
270 if (!IsPaused()) { 270 if (!IsPaused()) {
271 core_timing.SyncPause(false); 271 core_timing.SyncPause(false);
272 kernel.SuspendApplication(false); 272 kernel.SuspendEmulation(false);
273 } 273 }
274 } 274 }
275 275
@@ -459,7 +459,7 @@ struct System::Impl {
459 } 459 }
460 460
461 Network::CancelPendingSocketOperations(); 461 Network::CancelPendingSocketOperations();
462 kernel.SuspendApplication(true); 462 kernel.SuspendEmulation(true);
463 if (services) { 463 if (services) {
464 services->KillNVNFlinger(); 464 services->KillNVNFlinger();
465 } 465 }