summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNarr the Reg <juangerman-13@hotmail.com>2023-12-01 14:21:55 -0600
committerNarr the Reg <juangerman-13@hotmail.com>2023-12-01 14:21:55 -0600
commite40a2d2fd26df45878be8ca02dcd6a30054fbbaa (patch)
tree4982cbf9c8ded78186aa99f27c929c8fbdfdefab /src
parent9dc9aaf4af1c3c846c9cd46a9433dcf0684da19b (diff)
service: nfc: Don't tag amiibos as corrupted if they are loaded as read only
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/nfc/common/device.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/service/nfc/common/device.cpp b/src/core/hle/service/nfc/common/device.cpp
index 47516f883..f97e5b44c 100644
--- a/src/core/hle/service/nfc/common/device.cpp
+++ b/src/core/hle/service/nfc/common/device.cpp
@@ -438,16 +438,16 @@ Result NfcDevice::Mount(NFP::ModelType model_type, NFP::MountTarget mount_target
is_corrupted = true;
}
- if (!is_corrupted) {
+ device_state = DeviceState::TagMounted;
+ mount_target = mount_target_;
+
+ if (!is_corrupted && mount_target != NFP::MountTarget::Rom) {
std::vector<u8> data(sizeof(NFP::EncryptedNTAG215File));
memcpy(data.data(), &encrypted_tag_data, sizeof(encrypted_tag_data));
WriteBackupData(encrypted_tag_data.uuid, data);
}
- device_state = DeviceState::TagMounted;
- mount_target = mount_target_;
-
- if (is_corrupted) {
+ if (is_corrupted && mount_target != NFP::MountTarget::Rom) {
bool has_backup = HasBackup(encrypted_tag_data.uuid).IsSuccess();
return has_backup ? ResultCorruptedDataWithBackup : ResultCorruptedData;
}