summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJannik Vogel <email@jannikvogel.de>2016-04-11 15:20:05 +0200
committerJannik Vogel <email@jannikvogel.de>2016-04-11 15:20:05 +0200
commit997af88ec6ceb5852c03749592c1cd9901d5bad7 (patch)
tree6db260b497859c614863dd499942dbcbc6df2a69 /src
parentf2c86197042ab3179ce81e4b7e370f3bd7a46b75 (diff)
Use Settings::Apply in SDL frontend
Diffstat (limited to 'src')
-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) {
log_filter.ParseFilterString(Settings::values.log_filter);
- GDBStub::ToggleServer(use_gdbstub);
- GDBStub::SetServerPort(gdb_port);
+ // Apply the command line arguments
+ Settings::values.gdbstub_port = gdb_port;
+ Settings::values.use_gdbstub = use_gdbstub;
+ Settings::Apply();
std::unique_ptr<EmuWindow_SDL2> emu_window = std::make_unique<EmuWindow_SDL2>();
- VideoCore::g_hw_renderer_enabled = Settings::values.use_hw_renderer;
- VideoCore::g_shader_jit_enabled = Settings::values.use_shader_jit;
-
System::Init(emu_window.get());
SCOPE_EXIT({ System::Shutdown(); });