diff options
| author | bunnei <bunneidev@gmail.com> | 2021-04-14 17:47:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-14 17:47:18 -0700 |
| commit | de5bf640b7309450357074083a9ac397f251adbc (patch) | |
| tree | e7c9b9845f7751c2cc4a00dbf05798ff2a69490d /src/yuzu_cmd/yuzu.cpp | |
| parent | eedbe8351ca544f68bd10c0d851dbafbb2875c2a (diff) | |
| parent | a4c6712a4be249bf668df7f0ff83a0a5236283b2 (diff) | |
Merge pull request #6196 from bunnei/asserts-setting
core: settings: Add setting for debug assertions and disable by default.
Diffstat (limited to 'src/yuzu_cmd/yuzu.cpp')
| -rw-r--r-- | src/yuzu_cmd/yuzu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index 982c41785..b431db659 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp @@ -20,6 +20,7 @@ #include "common/nvidia_flags.h" #include "common/scm_rev.h" #include "common/scope_exit.h" +#include "common/settings.h" #include "common/string_util.h" #include "common/telemetry.h" #include "core/core.h" @@ -29,7 +30,6 @@ #include "core/hle/kernel/process.h" #include "core/hle/service/filesystem/filesystem.h" #include "core/loader/loader.h" -#include "core/settings.h" #include "core/telemetry_session.h" #include "input_common/main.h" #include "video_core/renderer_base.h" @@ -164,7 +164,7 @@ int main(int argc, char** argv) { InputCommon::InputSubsystem input_subsystem; // Apply the command line arguments - Settings::Apply(system); + system.ApplySettings(); std::unique_ptr<EmuWindow_SDL2> emu_window; switch (Settings::values.renderer_backend.GetValue()) { |
