diff options
| author | 2020-09-16 20:59:44 +0000 | |
|---|---|---|
| committer | 2020-09-16 20:59:44 +0000 | |
| commit | b0ae8265ea0aea16bfe37dce96cc3f758fd35feb (patch) | |
| tree | 735e838e0e271449cecaedc6977c1831c9e39a3a /src/core/core.cpp | |
| parent | Merge pull request #4658 from lioncash/copy3 (diff) | |
| parent | core/loader: Remove dependencies on the global system instance (diff) | |
| download | yuzu-b0ae8265ea0aea16bfe37dce96cc3f758fd35feb.tar.gz yuzu-b0ae8265ea0aea16bfe37dce96cc3f758fd35feb.tar.xz yuzu-b0ae8265ea0aea16bfe37dce96cc3f758fd35feb.zip | |
Merge pull request #4661 from lioncash/system-loader
core/loader: Remove dependencies on the global system instance
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index df81e8e2c..05b1d2b92 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -221,7 +221,7 @@ struct System::Impl { | |||
| 221 | telemetry_session->AddInitialInfo(*app_loader); | 221 | telemetry_session->AddInitialInfo(*app_loader); |
| 222 | auto main_process = | 222 | auto main_process = |
| 223 | Kernel::Process::Create(system, "main", Kernel::Process::ProcessType::Userland); | 223 | Kernel::Process::Create(system, "main", Kernel::Process::ProcessType::Userland); |
| 224 | const auto [load_result, load_parameters] = app_loader->Load(*main_process); | 224 | const auto [load_result, load_parameters] = app_loader->Load(*main_process, system); |
| 225 | if (load_result != Loader::ResultStatus::Success) { | 225 | if (load_result != Loader::ResultStatus::Success) { |
| 226 | LOG_CRITICAL(Core, "Failed to load ROM (Error {})!", static_cast<int>(load_result)); | 226 | LOG_CRITICAL(Core, "Failed to load ROM (Error {})!", static_cast<int>(load_result)); |
| 227 | Shutdown(); | 227 | Shutdown(); |