From e0dd440b1ff9bf4578d7b69912dfe4283bfd4e6a Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 14 Sep 2020 16:47:25 -0400 Subject: crypto/key_manager: Remove dependency on the global system accessor We can supply the content provider as an argument instead of hardcoding a global accessor in the implementation. --- src/yuzu/main.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/yuzu/main.cpp') diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 68ad43a80..bb3a08ac7 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -2592,8 +2592,10 @@ void GMainWindow::OnReinitializeKeys(ReinitializeKeyBehavior behavior) { const auto function = [this, &keys, &pdm] { keys.PopulateFromPartitionData(pdm); - Core::System::GetInstance().GetFileSystemController().CreateFactories(*vfs); - keys.DeriveETicket(pdm); + + auto& system = Core::System::GetInstance(); + system.GetFileSystemController().CreateFactories(*vfs); + keys.DeriveETicket(pdm, system.GetContentProvider()); }; QString errors; -- cgit v1.2.3