From b504df9d0233c2d3545cb08b186e41a3b46ca461 Mon Sep 17 00:00:00 2001 From: german77 Date: Sun, 20 Feb 2022 01:58:34 -0600 Subject: [PATCH] yuzu: Remove amiibos on drag and drop --- src/yuzu/main.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index e3fd38a026..b3a8da0eae 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -2937,6 +2937,7 @@ void GMainWindow::OnLoadAmiibo() { if (nfc_state == Service::NFP::DeviceState::TagFound || nfc_state == Service::NFP::DeviceState::TagMounted) { nfc->CloseAmiibo(); + QMessageBox::warning(this, tr("Amiibo"), tr("The current amiibo has been removed")); return; } @@ -2965,6 +2966,15 @@ void GMainWindow::LoadAmiibo(const QString& filename) { return; } + // Remove amiibo if one is connected + const auto nfc_state = nfc->GetCurrentState(); + if (nfc_state == Service::NFP::DeviceState::TagFound || + nfc_state == Service::NFP::DeviceState::TagMounted) { + nfc->CloseAmiibo(); + QMessageBox::warning(this, tr("Amiibo"), tr("The current amiibo has been removed")); + return; + } + QFile nfc_file{filename}; if (!nfc_file.open(QIODevice::ReadOnly)) { QMessageBox::warning(this, tr("Error opening Amiibo data file"),