mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-07-04 23:31:19 +01:00
Merge pull request #11517 from german77/amiibo-format
service: nfc: Fix amiibo formatting
This commit is contained in:
commit
d26c76180d
1 changed files with 8 additions and 6 deletions
|
@ -874,17 +874,19 @@ Result NfcDevice::RestoreAmiibo() {
|
||||||
}
|
}
|
||||||
|
|
||||||
Result NfcDevice::Format() {
|
Result NfcDevice::Format() {
|
||||||
auto result1 = DeleteApplicationArea();
|
Result result = ResultSuccess;
|
||||||
auto result2 = DeleteRegisterInfo();
|
|
||||||
|
|
||||||
if (result1.IsError()) {
|
if (device_state == DeviceState::TagFound) {
|
||||||
return result1;
|
result = Mount(NFP::ModelType::Amiibo, NFP::MountTarget::All);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (result2.IsError()) {
|
if (result.IsError()) {
|
||||||
return result2;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
DeleteApplicationArea();
|
||||||
|
DeleteRegisterInfo();
|
||||||
|
|
||||||
return Flush();
|
return Flush();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue