service: nfc: Fix amiibo formatting

2023-09-15 21:41:05 -06:00 · 2023-09-15 21:41:05 -06:00 · 0d4aa9125e
commit 0d4aa9125e
parent 8fb9f78e83
1 changed files with 8 additions and 6 deletions
--- 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();
 }