VERY experimental Nintendo Switch 2 emulator
C++
service: nfc: Fix amiibo formatting
german773bca24616af6
diff --git a/src/core/hle/service/nfc/common/device.cpp b/src/core/hle/service/nfc/common/device.cppindex 5dda123438..674d2e4b25 100644--- a/src/core/hle/service/nfc/common/device.cpp+++ b/src/core/hle/service/nfc/common/device.cpp@@ -874,17 +874,19 @@ Result NfcDevice::RestoreAmiibo() {}Result NfcDevice::Format() {- auto result1 = DeleteApplicationArea();- auto result2 = DeleteRegisterInfo();+ Result result = ResultSuccess;- if (result1.IsError()) {- return result1;+ if (device_state == DeviceState::TagFound) {+ result = Mount(NFP::ModelType::Amiibo, NFP::MountTarget::All);}- if (result2.IsError()) {- return result2;+ if (result.IsError()) {+ return result;}+ DeleteApplicationArea();+ DeleteRegisterInfo();+return Flush();}