CCF_100
/
suyu-mirror
mirror of https://git.suyu.dev/suyu/suyu
1
0
Fork 0
Code Issues Releases Wiki Activity

yuzu: Remove amiibos on drag and drop

merge-requests/60/head
german77 2022-02-20 01:58:34 +07:00
parent 2984695265
commit b504df9d02
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/yuzu/main.cpp
Unescape Escape View File

@ -2937,6 +2937,7 @@ void GMainWindow::OnLoadAmiibo() {
if (nfc_state == Service::NFP::DeviceState::TagFound || if (nfc_state == Service::NFP::DeviceState::TagFound ||
nfc_state == Service::NFP::DeviceState::TagMounted) { nfc_state == Service::NFP::DeviceState::TagMounted) {
nfc->CloseAmiibo(); nfc->CloseAmiibo();
QMessageBox::warning(this, tr("Amiibo"), tr("The current amiibo has been removed"));
return; return;
} }
@ -2965,6 +2966,15 @@ void GMainWindow::LoadAmiibo(const QString& filename) {
return; 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}; QFile nfc_file{filename};
if (!nfc_file.open(QIODevice::ReadOnly)) { if (!nfc_file.open(QIODevice::ReadOnly)) {
QMessageBox::warning(this, tr("Error opening Amiibo data file"), QMessageBox::warning(this, tr("Error opening Amiibo data file"),