diff options
| author | Rodrigo Locatti <reinuseslisp@airmail.cc> | 2020-11-27 19:29:59 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-27 19:29:59 -0300 |
| commit | 1dbe39f7a25357b40541ca536698cb09bb7df4ff (patch) | |
| tree | 285ffb3801aa773cb3537f77153a9e432390f6b8 /src/yuzu_cmd/yuzu.cpp | |
| parent | f397edff0ea6711bac15cfe47a0157e9b790b8bb (diff) | |
| parent | 5bc4eabe36b7ef4dcd5ad8db1e944705655be432 (diff) | |
Merge pull request #5028 from lioncash/final-system
core: Eliminate remaining usages of the global system instance
Diffstat (limited to 'src/yuzu_cmd/yuzu.cpp')
| -rw-r--r-- | src/yuzu_cmd/yuzu.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index ba6e89249..c2efe1ee6 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp @@ -25,7 +25,6 @@ #include "core/crypto/key_manager.h" #include "core/file_sys/registered_cache.h" #include "core/file_sys/vfs_real.h" -#include "core/gdbstub/gdbstub.h" #include "core/hle/kernel/process.h" #include "core/hle/service/filesystem/filesystem.h" #include "core/loader/loader.h" @@ -174,13 +173,13 @@ int main(int argc, char** argv) { return -1; } + auto& system{Core::System::GetInstance()}; + InputCommon::InputSubsystem input_subsystem; + // Apply the command line arguments Settings::values.gdbstub_port = gdb_port; Settings::values.use_gdbstub = use_gdbstub; - Settings::Apply(); - - Core::System& system{Core::System::GetInstance()}; - InputCommon::InputSubsystem input_subsystem; + Settings::Apply(system); std::unique_ptr<EmuWindow_SDL2> emu_window; switch (Settings::values.renderer_backend.GetValue()) { |