diff options
| author | David <25727384+ogniK5377@users.noreply.github.com> | 2018-10-24 10:28:17 +1100 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2018-10-23 19:28:17 -0400 |
| commit | 50e4e81fd3a998813316cdabd05ef56b12c91fae (patch) | |
| tree | b5b77eec3bdc55b411c04ca6a9d4a44f1e670f9c /src/yuzu/configuration/configure_general.cpp | |
| parent | 5edb2403c2030162bbb602dfd8289c738acff0e3 (diff) | |
Added Amiibo support (#1390)
* Fixed conflict with nfp
* Few fixups for nfc
* Conflict 2
* Fixed AttachAvailabilityChangeEvent
* Conflict 3
* Fixed byte padding
* Refactored amiibo to not reside in "System"
* Removed remaining references of nfc from system
* used enum for Nfc GetStateOld
* Added missing newline
* Moved file operations to front end
* Conflict 4
* Amiibos now use structs and added mutexes
* Removed amiibo_path
Diffstat (limited to 'src/yuzu/configuration/configure_general.cpp')
| -rw-r--r-- | src/yuzu/configuration/configure_general.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp index f5db9e55b..537d6e576 100644 --- a/src/yuzu/configuration/configure_general.cpp +++ b/src/yuzu/configuration/configure_general.cpp @@ -31,6 +31,7 @@ void ConfigureGeneral::setConfiguration() { ui->theme_combobox->setCurrentIndex(ui->theme_combobox->findData(UISettings::values.theme)); ui->use_cpu_jit->setChecked(Settings::values.use_cpu_jit); ui->use_docked_mode->setChecked(Settings::values.use_docked_mode); + ui->enable_nfc->setChecked(Settings::values.enable_nfc); } void ConfigureGeneral::PopulateHotkeyList(const HotkeyRegistry& registry) { @@ -45,4 +46,5 @@ void ConfigureGeneral::applyConfiguration() { Settings::values.use_cpu_jit = ui->use_cpu_jit->isChecked(); Settings::values.use_docked_mode = ui->use_docked_mode->isChecked(); + Settings::values.enable_nfc = ui->enable_nfc->isChecked(); } |