diff options
author | Zach Hilman <zachhilman@gmail.com> | 2018-07-28 21:39:42 -0400 |
---|---|---|
committer | Zach Hilman <zachhilman@gmail.com> | 2018-08-01 00:16:54 -0400 |
commit | 239a3113e4c6a53a2c7b12e67a0f21afae24b0aa (patch) | |
tree | 027bc4288f08be240d0b9b2a5f6c6431e76b8b4f /src/yuzu/main.cpp | |
parent | 22342487e8fb851a9837db22408db56240aa6931 (diff) |
Make XCI comply to review and style guidelines
Diffstat (limited to 'src/yuzu/main.cpp')
-rw-r--r-- | src/yuzu/main.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index d3523e6ac2..c274e5e2bd 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -13,7 +13,6 @@ #include <QMessageBox> #include <QtGui> #include <QtWidgets> -#include <core/crypto/key_manager.h> #include "common/common_paths.h" #include "common/logging/backend.h" #include "common/logging/filter.h" @@ -24,6 +23,7 @@ #include "common/scope_exit.h" #include "common/string_util.h" #include "core/core.h" +#include "core/crypto/key_manager.h" #include "core/gdbstub/gdbstub.h" #include "core/loader/loader.h" #include "core/settings.h" @@ -89,19 +89,6 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) { ui.setupUi(this); statusBar()->hide(); - // Initialize keys - std::string keys_dir = FileUtil::GetHactoolConfigurationPath(); - if (Settings::values.use_dev_keys) { - Crypto::keys.SetValidationMode(true); - if (FileUtil::Exists(keys_dir + DIR_SEP + "dev.keys")) - Crypto::keys.LoadFromFile(keys_dir + DIR_SEP + "dev.keys", false); - } else { - if (FileUtil::Exists(keys_dir + DIR_SEP + "prod.keys")) - Crypto::keys.LoadFromFile(keys_dir + DIR_SEP + "prod.keys", false); - } - if (FileUtil::Exists(keys_dir + DIR_SEP + "title.keys")) - Crypto::keys.LoadFromFile(keys_dir + DIR_SEP + "title.keys", true); - default_theme_paths = QIcon::themeSearchPaths(); UpdateUITheme(); |