diff options
| author | 2021-07-25 15:31:33 -0400 | |
|---|---|---|
| committer | 2021-07-25 15:31:33 -0400 | |
| commit | 09d6cc99435322c5f480eaa2b0967e33f4966ba6 (patch) | |
| tree | 72cdf06f6b7d77fdf5826104fea691f3ea450f54 /src/core/hle/kernel/svc.cpp | |
| parent | configuration: Use combobox apply template where possible (diff) | |
| parent | Merge pull request #6575 from FernandoS27/new_settings (diff) | |
| download | yuzu-09d6cc99435322c5f480eaa2b0967e33f4966ba6.tar.gz yuzu-09d6cc99435322c5f480eaa2b0967e33f4966ba6.tar.xz yuzu-09d6cc99435322c5f480eaa2b0967e33f4966ba6.zip | |
Merge branch 'master' into fullscreen-enum
Diffstat (limited to 'src/core/hle/kernel/svc.cpp')
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 8339e11a0..2eb532472 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp | |||
| @@ -298,6 +298,7 @@ static ResultCode ConnectToNamedPort(Core::System& system, Handle* out, VAddr po | |||
| 298 | // Create a session. | 298 | // Create a session. |
| 299 | KClientSession* session{}; | 299 | KClientSession* session{}; |
| 300 | R_TRY(port->CreateSession(std::addressof(session))); | 300 | R_TRY(port->CreateSession(std::addressof(session))); |
| 301 | port->Close(); | ||
| 301 | 302 | ||
| 302 | // Register the session in the table, close the extra reference. | 303 | // Register the session in the table, close the extra reference. |
| 303 | handle_table.Register(*out, session); | 304 | handle_table.Register(*out, session); |
| @@ -1439,11 +1440,6 @@ static void ExitProcess(Core::System& system) { | |||
| 1439 | LOG_INFO(Kernel_SVC, "Process {} exiting", current_process->GetProcessID()); | 1440 | LOG_INFO(Kernel_SVC, "Process {} exiting", current_process->GetProcessID()); |
| 1440 | ASSERT_MSG(current_process->GetStatus() == ProcessStatus::Running, | 1441 | ASSERT_MSG(current_process->GetStatus() == ProcessStatus::Running, |
| 1441 | "Process has already exited"); | 1442 | "Process has already exited"); |
| 1442 | |||
| 1443 | current_process->PrepareForTermination(); | ||
| 1444 | |||
| 1445 | // Kill the current thread | ||
| 1446 | system.Kernel().CurrentScheduler()->GetCurrentThread()->Exit(); | ||
| 1447 | } | 1443 | } |
| 1448 | 1444 | ||
| 1449 | static void ExitProcess32(Core::System& system) { | 1445 | static void ExitProcess32(Core::System& system) { |