diff options
| author | bunnei <bunneidev@gmail.com> | 2020-11-21 22:12:34 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-21 22:12:34 -0800 |
| commit | c0ca8b9fa4d1a6c4bdbef2fdb1bf72d57679d9a4 (patch) | |
| tree | be80bf80153857db46a24de4b34a7d8bbac7a0ae /src/core/core.cpp | |
| parent | e718f63b22e77ef4d0fe080e14534aee5b5e0271 (diff) | |
| parent | b4b63c878fafaa787d3d40d33582471ed4b7c07d (diff) | |
Merge pull request #4944 from lioncash/system-rem
patch_manager: Remove usages of the global system instance
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 2427960084..9253e05b7c 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -210,7 +210,7 @@ struct System::Impl { ResultStatus Load(System& system, Frontend::EmuWindow& emu_window, const std::string& filepath) { - app_loader = Loader::GetLoader(GetGameFileFromPath(virtual_filesystem, filepath)); + app_loader = Loader::GetLoader(system, GetGameFileFromPath(virtual_filesystem, filepath)); if (!app_loader) { LOG_CRITICAL(Core, "Failed to obtain loader for {}!", filepath); return ResultStatus::ErrorGetLoader; @@ -224,7 +224,7 @@ struct System::Impl { return init_result; } - telemetry_session->AddInitialInfo(*app_loader); + telemetry_session->AddInitialInfo(*app_loader, fs_controller, *content_provider); auto main_process = Kernel::Process::Create(system, "main", Kernel::Process::ProcessType::Userland); const auto [load_result, load_parameters] = app_loader->Load(*main_process, system); @@ -338,7 +338,7 @@ struct System::Impl { Service::Glue::ApplicationLaunchProperty launch{}; launch.title_id = process.GetTitleID(); - FileSys::PatchManager pm{launch.title_id}; + FileSys::PatchManager pm{launch.title_id, fs_controller, *content_provider}; launch.version = pm.GetGameVersion().value_or(0); // TODO(DarkLordZach): When FSController/Game Card Support is added, if |