diff options
author | wwylele <wwylele@gmail.com> | 2016-09-02 14:18:45 +0200 |
---|---|---|
committer | wwylele <wwylele@gmail.com> | 2016-09-02 14:18:45 +0200 |
commit | bdc59c4c21bebccd6b8497f8f3667c57574677b1 (patch) | |
tree | 01751cd1c7329b041aaa1d40cf1bf8b098c61567 /src | |
parent | Merge pull request #2040 from citra-emu/revert-2037-msvc-relwithdebinfo (diff) | |
download | yuzu-bdc59c4c21bebccd6b8497f8f3667c57574677b1.tar yuzu-bdc59c4c21bebccd6b8497f8f3667c57574677b1.tar.gz yuzu-bdc59c4c21bebccd6b8497f8f3667c57574677b1.tar.bz2 yuzu-bdc59c4c21bebccd6b8497f8f3667c57574677b1.tar.lz yuzu-bdc59c4c21bebccd6b8497f8f3667c57574677b1.tar.xz yuzu-bdc59c4c21bebccd6b8497f8f3667c57574677b1.tar.zst yuzu-bdc59c4c21bebccd6b8497f8f3667c57574677b1.zip |
Diffstat (limited to '')
-rw-r--r-- | src/citra_qt/configure_dialog.cpp | 8 | ||||
-rw-r--r-- | src/citra_qt/configure_dialog.h | 3 | ||||
-rw-r--r-- | src/citra_qt/configure_system.cpp | 6 | ||||
-rw-r--r-- | src/citra_qt/configure_system.h | 2 | ||||
-rw-r--r-- | src/citra_qt/main.cpp | 2 |
5 files changed, 9 insertions, 12 deletions
diff --git a/src/citra_qt/configure_dialog.cpp b/src/citra_qt/configure_dialog.cpp index 7da8ad067..016f201ef 100644 --- a/src/citra_qt/configure_dialog.cpp +++ b/src/citra_qt/configure_dialog.cpp @@ -9,10 +9,9 @@ #include "core/settings.h" -ConfigureDialog::ConfigureDialog(QWidget *parent, bool running) : +ConfigureDialog::ConfigureDialog(QWidget *parent) : QDialog(parent), - ui(new Ui::ConfigureDialog), - emulation_running(running) + ui(new Ui::ConfigureDialog) { ui->setupUi(this); this->setConfiguration(); @@ -22,9 +21,6 @@ ConfigureDialog::~ConfigureDialog() { } void ConfigureDialog::setConfiguration() { - // System tab needs set manually - // depending on whether emulation is running - ui->systemTab->setConfiguration(emulation_running); } void ConfigureDialog::applyConfiguration() { diff --git a/src/citra_qt/configure_dialog.h b/src/citra_qt/configure_dialog.h index 305b33bdf..e232699cd 100644 --- a/src/citra_qt/configure_dialog.h +++ b/src/citra_qt/configure_dialog.h @@ -16,7 +16,7 @@ class ConfigureDialog : public QDialog Q_OBJECT public: - explicit ConfigureDialog(QWidget *parent, bool emulation_running); + explicit ConfigureDialog(QWidget *parent); ~ConfigureDialog(); void applyConfiguration(); @@ -26,5 +26,4 @@ private: private: std::unique_ptr<Ui::ConfigureDialog> ui; - bool emulation_running; }; diff --git a/src/citra_qt/configure_system.cpp b/src/citra_qt/configure_system.cpp index 4f0d4dbfe..55d964242 100644 --- a/src/citra_qt/configure_system.cpp +++ b/src/citra_qt/configure_system.cpp @@ -8,6 +8,7 @@ #include "core/hle/service/fs/archive.h" #include "core/hle/service/cfg/cfg.h" +#include "core/system.h" static const std::array<int, 12> days_in_month = {{ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 @@ -17,6 +18,7 @@ ConfigureSystem::ConfigureSystem(QWidget *parent) : QWidget(parent), ui(new Ui::ConfigureSystem) { ui->setupUi(this); + this->setConfiguration(); connect(ui->combo_birthmonth, SIGNAL(currentIndexChanged(int)), SLOT(updateBirthdayComboBox(int))); } @@ -24,8 +26,8 @@ ConfigureSystem::ConfigureSystem(QWidget *parent) : ConfigureSystem::~ConfigureSystem() { } -void ConfigureSystem::setConfiguration(bool emulation_running) { - enabled = !emulation_running; +void ConfigureSystem::setConfiguration() { + enabled = !System::IsPoweredOn(); if (!enabled) { ReadSystemSettings(); diff --git a/src/citra_qt/configure_system.h b/src/citra_qt/configure_system.h index 1f5577070..f02d2d949 100644 --- a/src/citra_qt/configure_system.h +++ b/src/citra_qt/configure_system.h @@ -20,7 +20,7 @@ public: ~ConfigureSystem(); void applyConfiguration(); - void setConfiguration(bool emulation_running); + void setConfiguration(); public slots: void updateBirthdayComboBox(int birthmonth_index); diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 9fd4482f6..cf467532f 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -510,7 +510,7 @@ void GMainWindow::ToggleWindowMode() { } void GMainWindow::OnConfigure() { - ConfigureDialog configureDialog(this, emulation_running); + ConfigureDialog configureDialog(this); auto result = configureDialog.exec(); if (result == QDialog::Accepted) { |