summaryrefslogtreecommitdiffstats
path: root/src/core/hle
diff options
context:
space:
mode:
authorLiam <byteslice@airmail.cc>2023-08-26 23:12:05 +0200
committerLiam <byteslice@airmail.cc>2023-08-26 23:12:05 +0200
commitb7523d6fa77a963409d5fbfec4879c22a6ef9f3f (patch)
treed9b7acc75eae4c216aeb39a3be6f3418fe3c894d /src/core/hle
parentMerge pull request #11377 from BenjaminHalko/reverse-slider-input (diff)
downloadyuzu-b7523d6fa77a963409d5fbfec4879c22a6ef9f3f.tar
yuzu-b7523d6fa77a963409d5fbfec4879c22a6ef9f3f.tar.gz
yuzu-b7523d6fa77a963409d5fbfec4879c22a6ef9f3f.tar.bz2
yuzu-b7523d6fa77a963409d5fbfec4879c22a6ef9f3f.tar.lz
yuzu-b7523d6fa77a963409d5fbfec4879c22a6ef9f3f.tar.xz
yuzu-b7523d6fa77a963409d5fbfec4879c22a6ef9f3f.tar.zst
yuzu-b7523d6fa77a963409d5fbfec4879c22a6ef9f3f.zip
Diffstat (limited to 'src/core/hle')
-rw-r--r--src/core/hle/service/am/am.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index 8d057b3a8..d82a3169d 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -340,7 +340,7 @@ void ISelfController::Exit(HLERequestContext& ctx) {
void ISelfController::LockExit(HLERequestContext& ctx) {
LOG_DEBUG(Service_AM, "called");
- system.SetExitLock(true);
+ system.SetExitLocked(true);
IPC::ResponseBuilder rb{ctx, 2};
rb.Push(ResultSuccess);
@@ -349,10 +349,14 @@ void ISelfController::LockExit(HLERequestContext& ctx) {
void ISelfController::UnlockExit(HLERequestContext& ctx) {
LOG_DEBUG(Service_AM, "called");
- system.SetExitLock(false);
+ system.SetExitLocked(false);
IPC::ResponseBuilder rb{ctx, 2};
rb.Push(ResultSuccess);
+
+ if (system.GetExitRequested()) {
+ system.Exit();
+ }
}
void ISelfController::EnterFatalSection(HLERequestContext& ctx) {