diff options
| author | 2016-12-22 11:47:44 -0500 | |
|---|---|---|
| committer | 2016-12-22 11:47:44 -0500 | |
| commit | aa47af7fb6efd0bda54cca2373ed978e538f6d61 (patch) | |
| tree | 93d96872603f64925cd632f27bb5c7046cadeedf /src/citra_qt/configure_system.cpp | |
| parent | Merge pull request #2285 from mailwl/csnd-format (diff) | |
| parent | ThreadContext: Move from "core" to "arm_interface". (diff) | |
| download | yuzu-aa47af7fb6efd0bda54cca2373ed978e538f6d61.tar.gz yuzu-aa47af7fb6efd0bda54cca2373ed978e538f6d61.tar.xz yuzu-aa47af7fb6efd0bda54cca2373ed978e538f6d61.zip | |
Merge pull request #2343 from bunnei/core-cleanup
Core: Top-level consolidate & misc cleanup
Diffstat (limited to 'src/citra_qt/configure_system.cpp')
| -rw-r--r-- | src/citra_qt/configure_system.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/citra_qt/configure_system.cpp b/src/citra_qt/configure_system.cpp index 873d314ec..eb1276ef3 100644 --- a/src/citra_qt/configure_system.cpp +++ b/src/citra_qt/configure_system.cpp | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #include "citra_qt/ui_settings.h" | 6 | #include "citra_qt/ui_settings.h" |
| 7 | #include "core/hle/service/cfg/cfg.h" | 7 | #include "core/hle/service/cfg/cfg.h" |
| 8 | #include "core/hle/service/fs/archive.h" | 8 | #include "core/hle/service/fs/archive.h" |
| 9 | #include "core/system.h" | ||
| 10 | #include "ui_configure_system.h" | 9 | #include "ui_configure_system.h" |
| 11 | 10 | ||
| 12 | static const std::array<int, 12> days_in_month = {{ | 11 | static const std::array<int, 12> days_in_month = {{ |
| @@ -24,7 +23,7 @@ ConfigureSystem::ConfigureSystem(QWidget* parent) : QWidget(parent), ui(new Ui:: | |||
| 24 | ConfigureSystem::~ConfigureSystem() {} | 23 | ConfigureSystem::~ConfigureSystem() {} |
| 25 | 24 | ||
| 26 | void ConfigureSystem::setConfiguration() { | 25 | void ConfigureSystem::setConfiguration() { |
| 27 | enabled = !System::IsPoweredOn(); | 26 | enabled = !Core::System::GetInstance().IsPoweredOn(); |
| 28 | 27 | ||
| 29 | if (!enabled) { | 28 | if (!enabled) { |
| 30 | ReadSystemSettings(); | 29 | ReadSystemSettings(); |