Fixed conflict with nfp

2018-10-18 12:53:38 +11:00
parent 7dee60d7d2
commit fdea1c5796
14 changed files with 287 additions and 73 deletions
--- a/src/yuzu_cmd/config.cpp
+++ b/src/yuzu_cmd/config.cpp
@@ -125,6 +125,7 @@ void Config::ReadValues() {

    // System
    Settings::values.use_docked_mode = sdl2_config->GetBoolean("System", "use_docked_mode", false);
+    Settings::values.enable_nfc = sdl2_config->GetBoolean("System", "enable_nfc", true);
    Settings::values.username = sdl2_config->Get("System", "username", "yuzu");
    if (Settings::values.username.empty()) {
        Settings::values.username = "yuzu";