summaryrefslogtreecommitdiff
path: root/src/yuzu_cmd/config.cpp
diff options
context:
space:
mode:
authorGravatar David2018-10-24 10:28:17 +1100
committerGravatar bunnei2018-10-23 19:28:17 -0400
commit50e4e81fd3a998813316cdabd05ef56b12c91fae (patch)
treeb5b77eec3bdc55b411c04ca6a9d4a44f1e670f9c /src/yuzu_cmd/config.cpp
parentMerge pull request #1515 from DarkLordZach/dlc-lfs (diff)
downloadyuzu-50e4e81fd3a998813316cdabd05ef56b12c91fae.tar.gz
yuzu-50e4e81fd3a998813316cdabd05ef56b12c91fae.tar.xz
yuzu-50e4e81fd3a998813316cdabd05ef56b12c91fae.zip
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_cmd/config.cpp')
-rw-r--r--src/yuzu_cmd/config.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp
index 5e42e48b2..654a15a5c 100644
--- a/src/yuzu_cmd/config.cpp
+++ b/src/yuzu_cmd/config.cpp
@@ -125,6 +125,7 @@ void Config::ReadValues() {
125 125
126 // System 126 // System
127 Settings::values.use_docked_mode = sdl2_config->GetBoolean("System", "use_docked_mode", false); 127 Settings::values.use_docked_mode = sdl2_config->GetBoolean("System", "use_docked_mode", false);
128 Settings::values.enable_nfc = sdl2_config->GetBoolean("System", "enable_nfc", true);
128 Settings::values.username = sdl2_config->Get("System", "username", "yuzu"); 129 Settings::values.username = sdl2_config->Get("System", "username", "yuzu");
129 if (Settings::values.username.empty()) { 130 if (Settings::values.username.empty()) {
130 Settings::values.username = "yuzu"; 131 Settings::values.username = "yuzu";