diff options
| author | bunnei <bunneidev@gmail.com> | 2014-10-08 01:44:13 +0200 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-10-08 01:44:13 +0200 |
| commit | a171000cbec1dbae4e5c0c34ea1d7ef1b4313164 (patch) | |
| tree | a6bc766749aabd4eb8df276749fe51db49ee7030 /src/citra_qt/main.cpp | |
| parent | Merge pull request #129 from linkmauve/master (diff) | |
| parent | Added configuration file system. (diff) | |
| download | yuzu-a171000cbec1dbae4e5c0c34ea1d7ef1b4313164.tar yuzu-a171000cbec1dbae4e5c0c34ea1d7ef1b4313164.tar.gz yuzu-a171000cbec1dbae4e5c0c34ea1d7ef1b4313164.tar.bz2 yuzu-a171000cbec1dbae4e5c0c34ea1d7ef1b4313164.tar.lz yuzu-a171000cbec1dbae4e5c0c34ea1d7ef1b4313164.tar.xz yuzu-a171000cbec1dbae4e5c0c34ea1d7ef1b4313164.tar.zst yuzu-a171000cbec1dbae4e5c0c34ea1d7ef1b4313164.zip | |
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); } |