summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jannik Vogel2016-04-11 15:20:05 +0200
committerGravatar Jannik Vogel2016-04-11 15:20:05 +0200
commit997af88ec6ceb5852c03749592c1cd9901d5bad7 (patch)
tree6db260b497859c614863dd499942dbcbc6df2a69
parentCitraQt: Apply config at startup (diff)
downloadyuzu-997af88ec6ceb5852c03749592c1cd9901d5bad7.tar.gz
yuzu-997af88ec6ceb5852c03749592c1cd9901d5bad7.tar.xz
yuzu-997af88ec6ceb5852c03749592c1cd9901d5bad7.zip
Use Settings::Apply in SDL frontend
Diffstat (limited to '')
-rw-r--r--src/citra/citra.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index 3a1fbe3f7..d6ad13f69 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -93,14 +93,13 @@ int main(int argc, char **argv) {
93 93
94 log_filter.ParseFilterString(Settings::values.log_filter); 94 log_filter.ParseFilterString(Settings::values.log_filter);
95 95
96 GDBStub::ToggleServer(use_gdbstub); 96 // Apply the command line arguments
97 GDBStub::SetServerPort(gdb_port); 97 Settings::values.gdbstub_port = gdb_port;
98 Settings::values.use_gdbstub = use_gdbstub;
99 Settings::Apply();
98 100
99 std::unique_ptr<EmuWindow_SDL2> emu_window = std::make_unique<EmuWindow_SDL2>(); 101 std::unique_ptr<EmuWindow_SDL2> emu_window = std::make_unique<EmuWindow_SDL2>();
100 102
101 VideoCore::g_hw_renderer_enabled = Settings::values.use_hw_renderer;
102 VideoCore::g_shader_jit_enabled = Settings::values.use_shader_jit;
103
104 System::Init(emu_window.get()); 103 System::Init(emu_window.get());
105 SCOPE_EXIT({ System::Shutdown(); }); 104 SCOPE_EXIT({ System::Shutdown(); });
106 105