eden-emu/eden
14
3
Fork 4
Code Issues 3 Pull requests 4 Projects Releases 2 Packages Wiki Activity Actions 2

yuzu qt: Remove global system instances from config, WaitTree, main

Browse source
This commit is contained in:
lat9nq 2021-09-02 21:40:55 -04:00 • committed by Morph
parent d40819cfb1
commit 3aec34df0a
69 changed files with 687 additions and 635 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/yuzu/configuration/configure_system.cpp
View file

@ -17,7 +17,8 @@
#include "yuzu/configuration/configuration_shared.h"
#include "yuzu/configuration/configure_system.h"
ConfigureSystem::ConfigureSystem(QWidget* parent) : QWidget(parent), ui(new Ui::ConfigureSystem) {
ConfigureSystem::ConfigureSystem(Core::System& system_, QWidget* parent)
: QWidget(parent), ui(new Ui::ConfigureSystem), system{system_} {
ui->setupUi(this);
connect(ui->button_regenerate_console_id, &QPushButton::clicked, this,
&ConfigureSystem::RefreshConsoleID);
@ -59,7 +60,7 @@ void ConfigureSystem::RetranslateUI() {
}
void ConfigureSystem::SetConfiguration() {
enabled = !Core::System::GetInstance().IsPoweredOn();
enabled = !system.IsPoweredOn();
const auto rng_seed =
QStringLiteral("%1")
.arg(Settings::values.rng_seed.GetValue().value_or(0), 8, 16, QLatin1Char{'0'})
@ -103,8 +104,6 @@ void ConfigureSystem::SetConfiguration() {
void ConfigureSystem::ReadSystemSettings() {}
void ConfigureSystem::ApplyConfiguration() {
auto& system = Core::System::GetInstance();
// Allow setting custom RTC even if system is powered on,
// to allow in-game time to be fast forwarded
if (Settings::IsConfiguringGlobal()) {
@ -162,8 +161,6 @@ void ConfigureSystem::ApplyConfiguration() {
break;
}
}
system.ApplySettings();
}
void ConfigureSystem::RefreshConsoleID() {