summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2023-09-02 20:42:35 +0200
committerGitHub <noreply@github.com>2023-09-02 20:42:35 +0200
commit2c5e8e6d408f0e060da4665444132c4b8bbf7759 (patch)
tree2957a8ccab9c4d2fc6ffd57fc81afce158bcceab /src/core/hle/service
parentMerge pull request #11393 from FernandoS27/bayo-got-busted-up (diff)
parentam: shorten shutdown timeout when lock is not held (diff)
downloadyuzu-2c5e8e6d408f0e060da4665444132c4b8bbf7759.tar
yuzu-2c5e8e6d408f0e060da4665444132c4b8bbf7759.tar.gz
yuzu-2c5e8e6d408f0e060da4665444132c4b8bbf7759.tar.bz2
yuzu-2c5e8e6d408f0e060da4665444132c4b8bbf7759.tar.lz
yuzu-2c5e8e6d408f0e060da4665444132c4b8bbf7759.tar.xz
yuzu-2c5e8e6d408f0e060da4665444132c4b8bbf7759.tar.zst
yuzu-2c5e8e6d408f0e060da4665444132c4b8bbf7759.zip
Diffstat (limited to 'src/core/hle/service')
-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 da33f0e44..e92f400de 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -341,7 +341,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);
@@ -350,10 +350,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) {