diff options
| author | liamwhite <[email protected]> | 2023-09-02 14:42:35 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-09-02 14:42:35 -0400 |
| commit | 2c5e8e6d408f0e060da4665444132c4b8bbf7759 (patch) | |
| tree | 2957a8ccab9c4d2fc6ffd57fc81afce158bcceab /src/core/hle/service/am/am.cpp | |
| parent | 84eb1cdb654b6724f69cfeeb4546d4ee6ff860f5 (diff) | |
| parent | b7523d6fa77a963409d5fbfec4879c22a6ef9f3f (diff) | |
| download | yuzu-mainline-2c5e8e6d408f0e060da4665444132c4b8bbf7759.tar.gz yuzu-mainline-2c5e8e6d408f0e060da4665444132c4b8bbf7759.zip | |
Merge pull request #11384 from liamwhite/am-shutdown
am: shorten shutdown timeout when lock is not held
Diffstat (limited to 'src/core/hle/service/am/am.cpp')
| -rw-r--r-- | src/core/hle/service/am/am.cpp | 8 |
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) { |