diff options
author | archshift <admin@archshift.com> | 2014-09-12 17:06:13 -0700 |
---|---|---|
committer | archshift <admin@archshift.com> | 2014-10-07 15:09:37 -0700 |
commit | e6594f9f53df456db42ab2091a7b1397070ff9c8 (patch) | |
tree | a1ca13000e379f753a155580560c20e015c2e552 /src/citra_qt/main.cpp | |
parent | ee7cfc71bd8663b77a43c5ba577074972d9b7ad9 (diff) |
Added configuration file system.
Uses QSettings on citra-qt, and inih on citra-cli.
Diffstat (limited to 'src/citra_qt/main.cpp')
-rw-r--r-- | src/citra_qt/main.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 1bf9bc53c..bac6a6bb8 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -26,12 +26,16 @@ #include "core/core.h" #include "core/loader/loader.h" #include "core/arm/disassembler/load_symbol_map.h" +#include "citra_qt/config.h" #include "version.h" GMainWindow::GMainWindow() { + LogManager::Init(); + Config config; + ui.setupUi(this); statusBar()->hide(); @@ -112,7 +116,6 @@ GMainWindow::GMainWindow() show(); - LogManager::Init(); System::Init(render_window); } |