INSANEMODE/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2025-06-10 20:27:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make XCI comply to review and style guidelines

Browse Source
This commit is contained in:
Zach Hilman
2018-07-28 21:39:42 -04:00
parent 22342487e8
commit 239a3113e4
16 changed files with 223 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/yuzu/main.cpp
View File

@ -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();